Index: /trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java	(revision 17131)
+++ /trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java	(revision 17132)
@@ -64,7 +64,9 @@
      */
     public WayPoint(WayPoint p) {
-        attr = new HashMap<>();
+        attr = new HashMap<>(0);
         attr.putAll(p.attr);
-        attr.put(PT_TIME, p.getDate());
+        if (p.getDate() != null) {
+            attr.put(PT_TIME, p.getDate());
+        }
         lat = p.lat;
         lon = p.lon;
@@ -82,5 +84,5 @@
      */
     public WayPoint(LatLon ll) {
-        attr = new HashMap<>();
+        attr = new HashMap<>(0);
         lat = ll.lat();
         lon = ll.lon();