Index: trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java	(revision 6993)
+++ trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java	(revision 6994)
@@ -8,4 +8,5 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.MapView;
@@ -55,5 +56,8 @@
 
         // the command may have changed the selection so tell the listeners about the current situation
-        Main.main.getCurrentDataSet().fireSelectionChanged();
+        DataSet ds = Main.main.getCurrentDataSet();
+        if (ds != null) {
+            ds.fireSelectionChanged();
+        }
     }