Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java	(revision 15051)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java	(revision 15052)
@@ -244,5 +244,5 @@
      */
     public void paint(Graphics2D g, MapView mv, Bounds bbox) {
-        if (mousePos == null) {
+        if (mousePos == null || candidateNode != null && candidateNode.getDataSet() == null) {
             return;
         }