Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java	(revision 13294)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java	(revision 13295)
@@ -308,5 +308,8 @@
                 if (tracker.isErrorID(1)) {
                     // the tracker catches OutOfMemory conditions
+                    tracker.removeImage(img);
                     img = null;
+                } else {
+                    tracker.removeImage(img);
                 }
             } else {
@@ -317,5 +320,4 @@
                 if (this.entry != ImageDisplay.this.entry) {
                     // The file has changed
-                    tracker.removeImage(img);
                     return;
                 }
@@ -337,5 +339,4 @@
                         g.drawImage(img, xform, null);
                         g.dispose();
-                        tracker.removeImage(img);
                         img = rot;
                     }
@@ -351,5 +352,4 @@
                 errorLoading = (img == null);
             }
-            tracker.removeImage(img);
             ImageDisplay.this.repaint();
         }