catch exceptions thrown from initialization goals (#852)

diff --git a/src/loader.pl b/src/loader.pl
index 4bd88e377af19fc9fe660d3d22658db57ff287da..52f51d7d8b7d2b9b86aa1692017c8b95923f301c 100644 (file)
--- a/src/loader.pl
+++ b/src/loader.pl
@@ -105,23 +105,23 @@ file_load(_, _).
 
 file_load(Stream, Path, Evacuable) :-
     create_file_load_context(Stream, Path, Evacuable),
-    catch(loader:load_loop(Stream, Evacuable),
+    catch((loader:load_loop(Stream, Evacuable),
+           loader:run_initialization_goals),
           E,
           builtins:(loader:unload_evacuable(Evacuable),
                     loader:'$print_message_and_fail'(E),
                            builtins:throw(E))),
-    run_initialization_goals,
     '$pop_load_context'.
 
 
 load(Stream) :-
     create_load_context(Stream, Evacuable),
-    catch(loader:load_loop(Stream, Evacuable),
+    catch((loader:load_loop(Stream, Evacuable),
+           loader:run_initialization_goals),
           E,
           builtins:(loader:unload_evacuable(Evacuable),
                     loader:'$print_message_and_fail'(E),
                            builtins:throw(E))),
-    run_initialization_goals,
     '$pop_load_context',
     false.        %% Clear the heap.
 load(_).