diff --git a/ChangeLog b/ChangeLog
index b3bcb9353..638325409 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
 	* Source/NSPasteboard.m: ditto
 	* Source/GSTheme.m: Rewrite method replacement code to use new runtime
 	API... turns out to be rather simpler than using the old API.
+	Add safety measure for themes which load non-standard images.
 
 2010-03-04 Fred Kiefer <FredKiefer@gmx.de>
 
diff --git a/Source/GSTheme.m b/Source/GSTheme.m
index 5c84e8903..bc2250505 100644
--- a/Source/GSTheme.m
+++ b/Source/GSTheme.m
@@ -497,8 +497,11 @@ typedef	struct {
 		       * and the theme is unloaded, what happens when the
 		       * app tries to draw using the proxy to the unloaded
 		       * image?
+		       * To avoid that possibility, we save the new image
+		       * as if it were the old one ... so when the theme is
+		       * unloaded the old image persists.
 		       */
-		      NSLog(@"Help, could not load image '%@'", imageName);
+		      [_oldImages setObject: image forKey: imageName];
 		    }
 		  else
 		    {