diff --git a/ChangeLog b/ChangeLog
index 85c7b20b0..aa09e0d8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2012-01-25  Eric Wasylishen  <ericwa@ericwa-MacBook>
+2012-01-25  Eric Wasylishen  <ewasylishen@gmail.com>
+
+	* Source/NSImage.m (+imageNamed:): Don't try to look up path
+	if called with nil (just return nil).
+
+2012-01-25  Eric Wasylishen  <ewasylishen@gmail.com>
 
 	* Source/NSClipView.m: Disable copy-on-scroll until after release
 
diff --git a/Source/NSImage.m b/Source/NSImage.m
index 8bff78eea..bda01311c 100644
--- a/Source/NSImage.m
+++ b/Source/NSImage.m
@@ -209,7 +209,7 @@ repd_for_rep(NSArray *_reps, NSImageRep *rep)
    */
   [imageLock lock];
   image = (NSImage*)[nameDict objectForKey: aName];
-  if (image == nil)
+  if (image == nil && aName != nil)
     {
       NSString  *path = [self _pathForImageNamed: aName];