--- a/ObjectFileLoader.st	Tue Aug 15 13:45:23 1995 +0200
+++ b/ObjectFileLoader.st	Wed Aug 16 01:47:52 1995 +0200
@@ -22,7 +22,7 @@
 COPYRIGHT (c) 1993 by Claus Gittinger
 	     All Rights Reserved
 
-$Header: /cvs/stx/stx/libcomp/ObjectFileLoader.st,v 1.33 1995-08-15 11:45:23 claus Exp $
+$Header: /cvs/stx/stx/libcomp/ObjectFileLoader.st,v 1.34 1995-08-15 23:47:52 claus Exp $
 '!
 
 !ObjectFileLoader class methodsFor:'documentation'!
@@ -43,7 +43,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libcomp/ObjectFileLoader.st,v 1.33 1995-08-15 11:45:23 claus Exp $
+$Header: /cvs/stx/stx/libcomp/ObjectFileLoader.st,v 1.34 1995-08-15 23:47:52 claus Exp $
 "
 !
 
@@ -1017,15 +1017,19 @@
 !
 
 unloadAndRememberAllObjectFiles
-    PreviouslyLoadedObjects := LoadedObjects keys copy.
-    self unloadAllObjectFiles
+    LoadedObjects notNil ifTrue:[
+	PreviouslyLoadedObjects := LoadedObjects keys copy.
+	self unloadAllObjectFiles
+    ]
 !
 
 reloadAllRememberedObjectFiles
-    PreviouslyLoadedObjects do:[:fileName |
-	self loadObjectFile:fileName
-    ].
-    PreviouslyLoadedObjects := nil
+    PreviouslyLoadedObjects notNil ifTrue:[
+	PreviouslyLoadedObjects do:[:fileName |
+	    self loadObjectFile:fileName
+	].
+	PreviouslyLoadedObjects := nil
+    ]
 ! !
 
 !ObjectFileLoader class methodsFor:'queries'!
@@ -1552,7 +1556,7 @@
     sysHandle2 = __ArrayInstPtr(aHandle)->a_element[1];
 
 #ifdef GNU_DL
-
+  {
     void (*func)();
     unsigned long addr;
     char *name;
@@ -1594,9 +1598,11 @@
 	    }
 	}
     }
+  }
 #endif /* GNU_DL */
 
 #ifdef DL1_6
+  {
     void *h;
     void *addr;
     int val;
@@ -1618,6 +1624,7 @@
 	    }
 	}
     }
+  }
 #endif
 
 #ifdef SYSV4_DL
@@ -1652,7 +1659,7 @@
 
 #ifdef AIX_DL
   {
-    OBJ low, hi, fileName;
+    OBJ fileName;
     void *h;
     void *addr;
     int val;