Index: /trunk/src/org/openstreetmap/josm/gui/layer/MainLayerManager.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/MainLayerManager.java	(revision 18336)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/MainLayerManager.java	(revision 18337)
@@ -269,5 +269,9 @@
         if (event.getPreviousActiveLayer() != activeLayer || event.getPreviousDataLayer() != osmDataLayer) {
             for (ActiveLayerChangeListener l : activeLayerChangeListeners) {
-                l.activeOrEditLayerChanged(event);
+                try {
+                    l.activeOrEditLayerChanged(event);
+                } catch (RuntimeException e) {
+                    Logging.logWithStackTrace(Logging.LEVEL_ERROR, "Error in layer change listener", e);
+                }
             }
         }