Index: /trunk/src/org/openstreetmap/josm/data/osm/Way.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/Way.java	(revision 5186)
+++ /trunk/src/org/openstreetmap/josm/data/osm/Way.java	(revision 5187)
@@ -581,7 +581,8 @@
         for (Node n:nodes) {
             if (lastN != null) {
-                LatLon coor = n.getCoor();
-                if (coor != null) {
-                    length += coor.greatCircleDistance(lastN.getCoor());
+                LatLon lastNcoor = lastN.getCoor();
+            	LatLon coor = n.getCoor();
+                if (lastNcoor != null && coor != null) {
+                    length += coor.greatCircleDistance(lastNcoor);
                 }
             }