Index: /applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/EventBusPlugin.java
===================================================================
--- /applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/EventBusPlugin.java	(revision 34001)
+++ /applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/EventBusPlugin.java	(revision 34002)
@@ -423,10 +423,16 @@
         post(new MapFrameInitializedEvent(this, oldFrame, newFrame));
         if (newFrame != null) {
-            newFrame.getToggleDialog(LayerListDialog.class).getModel().addLayerListModelListener(layerListModelListener);
+            LayerListDialog dlg = newFrame.getToggleDialog(LayerListDialog.class);
+            if (dlg != null) {
+                dlg.getModel().addLayerListModelListener(layerListModelListener);
+            }
             newFrame.keyDetector.addKeyListener(keyPressReleaseListener);
             newFrame.keyDetector.addModifierExListener(modifierExListener);
         }
         if (oldFrame != null) {
-            oldFrame.getToggleDialog(LayerListDialog.class).getModel().removeLayerListModelListener(layerListModelListener);
+            LayerListDialog dlg = oldFrame.getToggleDialog(LayerListDialog.class);
+            if (dlg != null) {
+                dlg.getModel().removeLayerListModelListener(layerListModelListener);
+            }
             oldFrame.keyDetector.removeKeyListener(keyPressReleaseListener);
             oldFrame.keyDetector.removeModifierExListener(modifierExListener);