Index: trunk/src/org/openstreetmap/josm/data/osm/DataSet.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 14000)
+++ trunk/src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 14001)
@@ -1013,5 +1013,7 @@
 
     void fireWayNodesChanged(Way way) {
-        store.reindexWay(way, Way::updatePosition, Relation::updatePosition);
+        if (way.getNodesCount() > 0) {
+            store.reindexWay(way, Way::updatePosition, Relation::updatePosition);
+        }
         fireEvent(new WayNodesChangedEvent(this, way));
     }