Index: /trunk/src/org/openstreetmap/josm/gui/MapStatus.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 13177)
+++ /trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 13178)
@@ -1221,10 +1221,7 @@
     @Override
     public void wayNodesChanged(WayNodesChangedEvent event) {
-        DataSet ds = MainApplication.getLayerManager().getEditDataSet();
-        if (ds != null) {
-            Collection<OsmPrimitive> sel = ds.getSelected();
-            if (sel.size() == 1 && sel.contains(event.getChangedWay())) {
-                refreshDistText(sel);
-            }
+        Collection<OsmPrimitive> sel = event.getDataset().getSelected();
+        if (sel.size() == 1 && sel.contains(event.getChangedWay())) {
+            refreshDistText(sel);
         }
     }
@@ -1232,10 +1229,7 @@
     @Override
     public void nodeMoved(NodeMovedEvent event) {
-        DataSet ds = MainApplication.getLayerManager().getEditDataSet();
-        if (ds != null) {
-            Collection<OsmPrimitive> sel = ds.getSelected();
-            if (sel.size() == 2 && sel.contains(event.getNode())) {
-                refreshDistText(sel);
-            }
+        Collection<OsmPrimitive> sel = event.getDataset().getSelected();
+        if (sel.size() == 2 && sel.contains(event.getNode())) {
+            refreshDistText(sel);
         }
     }