Index: applications/editors/josm/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust/PhotoPropertyEditor.java
===================================================================
--- applications/editors/josm/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust/PhotoPropertyEditor.java	(revision 35769)
+++ applications/editors/josm/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust/PhotoPropertyEditor.java	(revision 35770)
@@ -42,4 +42,5 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -67,5 +68,4 @@
      */
     private static class PropertyEditorAction extends JosmAction implements LayerChangeListener, ImageDataUpdateListener {
-        boolean imgDataUpdLstReg = false;
 
         public PropertyEditorAction() {
@@ -137,5 +137,4 @@
             if (layer instanceof GeoImageLayer) {
                 ((GeoImageLayer) layer).getImageData().addImageDataUpdateListener(this);
-                imgDataUpdLstReg = true;
             }
         }
@@ -149,7 +148,8 @@
                 // e.g. if the plugin was added while the geo image layer
                 // existed and then the layer is removed.
-                if (imgDataUpdLstReg) {
+                try {
                     ((GeoImageLayer) layer).getImageData().removeImageDataUpdateListener(this);
-                    imgDataUpdLstReg = false;
+                } catch (IllegalArgumentException ignore) {
+                    Logging.trace(ignore);
                 }
             }