diff --git a/ChangeLog b/ChangeLog
index 8fd409393..0c1096a64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
 	* Source/NSDebug.m: Implemented _NSNewStringFromCString() for gdb.
 	* Source/GSFormat.m: Fix %S format.
 	* Source/NSObject.m: ([conformsToProtocol:]) return NO if passed nul.
+	* Source/NSBundle.m: be more tolerant.
 
 2005-07-24  Richard Frith-Macdonald <rfm@gnu.org>
 
diff --git a/Source/NSBundle.m b/Source/NSBundle.m
index 76b47aa42..4ce3066d2 100644
--- a/Source/NSBundle.m
+++ b/Source/NSBundle.m
@@ -390,7 +390,8 @@ _find_framework(NSString *name)
 					     name, @".framework"]])
 		{
 		  /* Try creating the bundle.  */
-		  bundle = [[self alloc] initWithPath: bundlePath];
+		  if (bundlePath)
+		    bundle = [[self alloc] initWithPath: bundlePath];
 		}
 #if !defined(__MINGW__)
 	    }
@@ -431,7 +432,7 @@ _find_framework(NSString *name)
 
       if (bundle == nil)
 	{
-	  NSLog (@"Could not find framework %@ in any standard location", name);
+	  NSWarnMLog (@"Could not find framework %@ in any standard location", name);
 	  return;
 	}