Index: /trunk/src/org/openstreetmap/josm/data/osm/Way.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/Way.java	(revision 3253)
+++ /trunk/src/org/openstreetmap/josm/data/osm/Way.java	(revision 3254)
@@ -371,9 +371,11 @@
                 if (n.getDataSet() != dataSet)
                     throw new DataIntegrityProblemException("Nodes in way must be in the same dataset");
-            }
-            if (Main.pref.getBoolean("debug.checkDeleteReferenced", true)) {
+                if (n.isDeleted())
+                    throw new DataIntegrityProblemException("Deleted node referenced: " + toString());
+            }
+            if (Main.pref.getBoolean("debug.checkNullCoor", true)) {
                 for (Node n: nodes) {
-                    if (n.isDeleted())
-                        throw new DataIntegrityProblemException("Deleted node referenced: " + toString());
+                    if (!n.isIncomplete() && (n.getCoor() == null || n.getEastNorth() == null))
+                        throw new DataIntegrityProblemException("Complete node with null coordinates: " + toString() + n.get3892DebugInfo());
                 }
             }