Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/download/MapillaryDownloader.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/download/MapillaryDownloader.java	(revision 31523)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/download/MapillaryDownloader.java	(revision 31524)
@@ -77,5 +77,4 @@
   /**
    * If some part of the current view has not been downloaded, it is downloaded.
-   *
    */
   public static void completeView() {
@@ -145,9 +144,10 @@
   public static void automaticDownload() {
     MapillaryLayer layer = MapillaryLayer.getInstance();
+    if (Main.map.mapView.getEditLayer() == null)
+      return;
     if (isAreaTooBig()) {
       tooBigErrorDialog();
       return;
     }
-
     if (getMode() != AUTOMATIC)
       throw new IllegalStateException("Must be in automatic mode.");