Index: /trunk/src/org/openstreetmap/josm/actions/MoveAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/MoveAction.java	(revision 12314)
+++ /trunk/src/org/openstreetmap/josm/actions/MoveAction.java	(revision 12315)
@@ -100,6 +100,7 @@
     @Override
     public void actionPerformed(ActionEvent event) {
+        DataSet ds = getLayerManager().getEditDataSet();
 
-        if (!Main.isDisplayingMapView())
+        if (!Main.isDisplayingMapView() || ds == null)
             return;
 
@@ -129,5 +130,4 @@
         }
 
-        DataSet ds = getLayerManager().getEditDataSet();
         Collection<OsmPrimitive> selection = ds.getSelected();
         Collection<Node> affectedNodes = AllNodesVisitor.getAllNodes(selection);