Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryData.java
===================================================================
--- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryData.java	(revision 31452)
+++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryData.java	(revision 31453)
@@ -38,5 +38,6 @@
     addListener(MapillaryPlugin.zoomAction);
     addListener(MapillaryPlugin.uploadAction);
-    addListener(MapillaryMainDialog.getInstance());
+    if (Main.main != null)
+      addListener(MapillaryMainDialog.getInstance());
   }
 
Index: applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/MapillarySequenceDownloadThreadTest.java
===================================================================
--- applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/MapillarySequenceDownloadThreadTest.java	(revision 31452)
+++ applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/MapillarySequenceDownloadThreadTest.java	(revision 31453)
@@ -21,13 +21,5 @@
  *
  */
-public class MapillarySequenceDownloadThreadTest {
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @Before
-    public void setUp() {
-        TestUtil.initPlugin();
-    }
+public class MapillarySequenceDownloadThreadTest extends AbstractTest {
 
     /**