Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java	(revision 943)
+++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java	(revision 944)
@@ -81,5 +81,6 @@
 			/* calculate time differences in waypoints */
 			double time = wpt.time;
-			if (firstTime < 0) {
+			boolean wpt_has_link = wpt.attr.containsKey("link");
+			if (firstTime < 0 && wpt_has_link) {
 				firstTime = time;
 				for (GpxLink oneLink : (Collection<GpxLink>) wpt.attr.get("link")) {
@@ -88,8 +89,10 @@
 				}
 			}
-			for (GpxLink oneLink : (Collection<GpxLink>) wpt.attr.get("link")) {
-				if (!oneLink.uri.equals(lastLinkedFile))firstTime = time;
-				lastLinkedFile = oneLink.uri;
-				break;
+			if (wpt_has_link) {
+				for (GpxLink oneLink : (Collection<GpxLink>) wpt.attr.get("link")) {
+					if (!oneLink.uri.equals(lastLinkedFile))firstTime = time;
+					lastLinkedFile = oneLink.uri;
+					break;
+				}
 			}
             Marker m = Marker.createMarker(wpt, indata.storageFile, this, time, time - firstTime);