Index: /applications/editors/josm/plugins/gpsblam/src/org/openstreetmap/josm/plugins/gpsblam/GPSBlamMode.java
===================================================================
--- /applications/editors/josm/plugins/gpsblam/src/org/openstreetmap/josm/plugins/gpsblam/GPSBlamMode.java	(revision 32744)
+++ /applications/editors/josm/plugins/gpsblam/src/org/openstreetmap/josm/plugins/gpsblam/GPSBlamMode.java	(revision 32745)
@@ -73,4 +73,5 @@
     public void exitMode() {
         super.exitMode();
+        getLayerManager().removeLayerChangeListener(this);
         Main.map.mapView.removeMouseListener(this);
         Main.map.mapView.removeMouseMotionListener(this);
@@ -218,9 +219,3 @@
         }
     }
-
-    @Override
-    public void destroy() {
-        super.destroy();
-        getLayerManager().removeLayerChangeListener(this);
-    }
 }