Index: applications/editors/josm/plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java
===================================================================
--- applications/editors/josm/plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java	(revision 33254)
+++ applications/editors/josm/plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java	(revision 33255)
@@ -102,5 +102,7 @@
         Main.map.mapView.removeMouseMotionListener(this);
         adjustingLayer = null;
-        listener.stop();
+        if (listener != null) {
+            listener.stop();
+        }
     }
 
