diff --git a/ChangeLog b/ChangeLog
index 73d32a8c9..8d40094cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-05-23  Adam Fedor  <fedor@gnu.org>
+
+	* Source/NSImage.m ([NSImage +imageNamed:]): Check for nil extension.
+
 2000-05-12 Georg Fleischmann
 
         * gui/Model/GMAppKit.m
diff --git a/Source/NSImage.m b/Source/NSImage.m
index cf98fca82..2beb9717d 100644
--- a/Source/NSImage.m
+++ b/Source/NSImage.m
@@ -183,6 +183,8 @@ static Class			cacheClass = 0;
       NSString *the_name = aName;
       main_bundle = [NSBundle mainBundle];
       ext  = [aName pathExtension];
+      if (ext && [ext length] == 0)
+      	ext = nil;
 
       /* Check if extension is one of the image types */
       array = [self imageFileTypes];