Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryLayer.java
===================================================================
--- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryLayer.java	(revision 31487)
+++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryLayer.java	(revision 31488)
@@ -132,10 +132,11 @@
     }
     createHatchTexture();
-
-    MapillaryMainDialog.getInstance()
-        .getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
-        .put(KeyStroke.getKeyStroke("DELETE"), "MapillaryDel");
-    MapillaryMainDialog.getInstance().getActionMap()
-        .put("MapillaryDel", new DeleteImageAction());
+    if (Main.main != null) {
+      MapillaryMainDialog.getInstance()
+          .getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
+          .put(KeyStroke.getKeyStroke("DELETE"), "MapillaryDel");
+      MapillaryMainDialog.getInstance().getActionMap()
+          .put("MapillaryDel", new DeleteImageAction());
+    }
 
     if (Main.main != null)
Index: applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/oauth/OAuthPortListenerTest.java
===================================================================
--- applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/oauth/OAuthPortListenerTest.java	(revision 31487)
+++ applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/oauth/OAuthPortListenerTest.java	(revision 31488)
@@ -28,4 +28,10 @@
     t.start();
     try {
+      synchronized (this) {
+        this.wait(500);
+      }
+    } catch (InterruptedException e1) {
+    }
+    try {
       URL url = new URL("http://localhost:8763?access_token=access_token");
       HttpURLConnection con = (HttpURLConnection) url.openConnection();