Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 4847)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 4848)
@@ -757,5 +757,5 @@
         mapModeListener = new MapModeChangeListener() {
             public void mapModeChange(MapMode oldMapMode, MapMode newMapMode) {
-                if (newMapMode instanceof org.openstreetmap.josm.actions.mapmode.SelectAction) {
+                if (newMapMode == null || (newMapMode instanceof org.openstreetmap.josm.actions.mapmode.SelectAction)) {
                     Main.map.mapView.addMouseListener(mouseAdapter);
                 } else {