Index: trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java	(revision 1997)
+++ trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java	(revision 1998)
@@ -124,5 +124,7 @@
                 for (WayPoint tpt : trkseg) {
                     if(last != null){
-                        result += last.getCoor().greatCircleDistance(tpt.getCoor());
+                        Double d = last.getCoor().greatCircleDistance(tpt.getCoor());
+                        if(!d.isNaN() && !d.isInfinite())
+                          result += d;
                     }
                     last = tpt;