Index: trunk/src/org/openstreetmap/josm/gui/SelectionManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/SelectionManager.java	(revision 12960)
+++ trunk/src/org/openstreetmap/josm/gui/SelectionManager.java	(revision 12961)
@@ -20,4 +20,5 @@
 import org.openstreetmap.josm.actions.SelectByInternalPointAction;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -373,4 +374,5 @@
         }
 
+        DataSet ds = MainApplication.getLayerManager().getEditDataSet();
         if (clicked) {
             Point center = new Point(selectionResult.xpoints[0], selectionResult.ypoints[0]);
@@ -379,7 +381,7 @@
                 selection.add(osm);
             }
-        } else {
+        } else if (ds != null) {
             // nodes
-            for (Node n : MainApplication.getLayerManager().getEditDataSet().getNodes()) {
+            for (Node n : ds.getNodes()) {
                 if (n.isSelectable() && selectionResult.contains(nc.getPoint2D(n))) {
                     selection.add(n);
@@ -388,5 +390,5 @@
 
             // ways
-            for (Way w : MainApplication.getLayerManager().getEditDataSet().getWays()) {
+            for (Way w : ds.getWays()) {
                 if (!w.isSelectable() || w.getNodesCount() == 0) {
                     continue;