Index: trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 482)
+++ trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 483)
@@ -358,5 +358,5 @@
 			if (n.incomplete || n.deleted || doneNodes.contains(n)) continue;
 			WayPoint wpt = new WayPoint(n.coor);
-			if (n.keys.containsKey("name")) {
+			if (n.keys != null && n.keys.containsKey("name")) {
 				wpt.attr.put("name", n.keys.get("name"));
 			}