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 31346)
+++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryLayer.java	(revision 31347)
@@ -109,7 +109,10 @@
                 Main.map.mapView.getEditLayer().data.addDataSetListener(this);
         }
-        MapillaryPlugin.setMenuEnabled(MapillaryPlugin.EXPORT_MENU, true);
-        if (!MapillaryMainDialog.getInstance().isShowing())
-            MapillaryMainDialog.getInstance().getButton().doClick();
+        if (MapillaryPlugin.EXPORT_MENU != null) { // Does not execute when in headless mode
+            MapillaryPlugin.setMenuEnabled(MapillaryPlugin.EXPORT_MENU, true);
+            if (!MapillaryMainDialog.getInstance().isShowing())
+                MapillaryMainDialog.getInstance().getButton().doClick();
+        }
+
         createHatchTexture();
         data.dataUpdated();
Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryPlugin.java
===================================================================
--- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryPlugin.java	(revision 31346)
+++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryPlugin.java	(revision 31347)
@@ -69,14 +69,16 @@
         downloadViewAction = new MapillaryDownloadViewAction();
 
-        DOWNLOAD_MENU = MainMenu.add(Main.main.menu.imageryMenu,
-                downloadAction, false);
-        EXPORT_MENU = MainMenu.add(Main.main.menu.fileMenu, exportAction,
-                false, 14);
-        IMPORT_MENU = MainMenu.add(Main.main.menu.fileMenu, importAction,
-                false, 14);
-        ZOOM_MENU = MainMenu
-                .add(Main.main.menu.viewMenu, zoomAction, false, 15);
-        DOWNLOAD_VIEW_MENU = MainMenu.add(Main.main.menu.fileMenu,
-                downloadViewAction, false, 14);
+        if (Main.main != null) { // important for headless mode
+            DOWNLOAD_MENU = MainMenu.add(Main.main.menu.imageryMenu,
+                    downloadAction, false);
+            EXPORT_MENU = MainMenu.add(Main.main.menu.fileMenu, exportAction,
+                    false, 14);
+            IMPORT_MENU = MainMenu.add(Main.main.menu.fileMenu, importAction,
+                    false, 14);
+            ZOOM_MENU = MainMenu
+                    .add(Main.main.menu.viewMenu, zoomAction, false, 15);
+            DOWNLOAD_VIEW_MENU = MainMenu.add(Main.main.menu.fileMenu,
+                    downloadViewAction, false, 14);
+        }
 
         EXPORT_MENU.setEnabled(false);