diff --git a/ChangeLog b/ChangeLog
index e3c379f88..da94763c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-10  Mirko Viviani  <mirko.viviani@rccr.cremona.it>
+
+	* Source/NSBundle.m ([NSBundle +_addFrameworkFromClass:]): avoid crash
+	when called with Nil class.
+
 2000-11-10 Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/GSTcpPort.m: Added some locking tweaks for writing data.
diff --git a/Source/NSBundle.m b/Source/NSBundle.m
index a73cb7abf..636966485 100644
--- a/Source/NSBundle.m
+++ b/Source/NSBundle.m
@@ -222,10 +222,15 @@ _bundle_name_first_match(NSString* directory, NSString* name)
 
 + (BOOL) _addFrameworkFromClass:(Class)frameworkClass
 {
-  NSBundle	*bundle;
+  NSBundle	 *bundle;
   NSString	**fmClasses;
-  NSString	*bundlePath = nil;
-  int		len = strlen(frameworkClass->name);
+  NSString	 *bundlePath = nil;
+  int		  len;
+
+  if (frameworkClass == Nil)
+    return NO;
+
+  len = strlen(frameworkClass->name);
 
   if (len > 12*sizeof(char)
     && !strncmp("NSFramework_", frameworkClass->name, sizeof(char)*12))