Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/commands/CommandMoveImage.java
===================================================================
--- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/commands/CommandMoveImage.java	(revision 31475)
+++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/commands/CommandMoveImage.java	(revision 31476)
@@ -3,5 +3,4 @@
 import static org.openstreetmap.josm.tools.I18n.trn;
 
-import java.util.ArrayList;
 import java.util.List;
 
@@ -31,5 +30,5 @@
   public CommandMoveImage(List<MapillaryAbstractImage> images, double x,
       double y) {
-    this.images = new ArrayList<>(images);
+    this.images = images;
     this.x = x;
     this.y = y;
@@ -43,5 +42,6 @@
     }
     checkModified();
-    Main.map.repaint();
+    if (Main.main != null)
+      Main.map.repaint();
   }
 
@@ -53,5 +53,6 @@
     }
     checkModified();
-    Main.map.repaint();
+    if (Main.main != null)
+      Main.map.repaint();
   }
 
Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/commands/CommandTurnImage.java
===================================================================
--- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/commands/CommandTurnImage.java	(revision 31475)
+++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/commands/CommandTurnImage.java	(revision 31476)
@@ -3,5 +3,4 @@
 import static org.openstreetmap.josm.tools.I18n.trn;
 
-import java.util.ArrayList;
 import java.util.List;
 
@@ -27,5 +26,5 @@
    */
   public CommandTurnImage(List<MapillaryAbstractImage> images, double ca) {
-    this.images = new ArrayList<>(images);
+    this.images = images;
     this.ca = ca;
   }
@@ -38,5 +37,6 @@
     }
     checkModified();
-    Main.map.repaint();
+    if (Main.main != null)
+      Main.map.repaint();
   }
 
@@ -48,5 +48,6 @@
     }
     checkModified();
-    Main.map.repaint();
+    if (Main.main != null)
+      Main.map.repaint();
   }
 
Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/commands/MapillaryRecord.java
===================================================================
--- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/commands/MapillaryRecord.java	(revision 31475)
+++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/commands/MapillaryRecord.java	(revision 31476)
@@ -6,5 +6,5 @@
 
 /**
- * History record system in order to let the user undo and redo commands
+ * History record system in order to let the user undo and redo commands.
  *
  * @author nokutu
@@ -97,5 +97,5 @@
   public void undo() {
     if (this.position == -1)
-      return;
+      throw new IllegalStateException();
     this.commandList.get(this.position).undo();
     this.position--;
@@ -104,9 +104,9 @@
 
   /**
-   * Redo latest undoed action.
+   * Redoes latest undone action.
    */
   public void redo() {
     if (this.position + 1 >= this.commandList.size())
-      return;
+      throw new IllegalStateException();
     this.position++;
     this.commandList.get(this.position).redo();
Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/oauth/MapillaryUser.java
===================================================================
--- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/oauth/MapillaryUser.java	(revision 31475)
+++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/oauth/MapillaryUser.java	(revision 31476)
@@ -87,4 +87,3 @@
     isTokenValid = true;
   }
-
 }