Index: trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java	(revision 570)
+++ trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java	(revision 571)
@@ -33,11 +33,15 @@
 	 */
 	public void setTime () {
-		if (! attr.containsKey("time"))
+		if (! attr.containsKey("time")) {
 			time = 0.0;
+			return;
+		}
 		SimpleDateFormat f = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); // ignore timezone
 		Date d = f.parse(attr.get("time").toString(), new ParsePosition(0));
-		if (d == null /* failed to parse */)
+		if (d == null /* failed to parse */) {
 			time = 0.0;
-		time = d.getTime() / 1000.0; /* ms => seconds */
+		} else {
+			time = d.getTime() / 1000.0; /* ms => seconds */
+		}
 	}