Index: trunk/src/org/openstreetmap/josm/gui/MapViewState.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapViewState.java	(revision 11989)
+++ trunk/src/org/openstreetmap/josm/gui/MapViewState.java	(revision 11991)
@@ -189,6 +189,6 @@
 
     /**
-     * Gets the {@link MapViewPoint} for the given node. This is faster than {@link #getPointFor(LatLon)} because it uses the node east/north
-     * cache.
+     * Gets the {@link MapViewPoint} for the given node.
+     * This is faster than {@link #getPointFor(LatLon)} because it uses the node east/north cache.
      * @param node The node
      * @return The position of that node.
@@ -197,5 +197,6 @@
     public MapViewPoint getPointFor(Node node) {
         try {
-            return getPointFor(node.getEastNorth(getProjection()));
+            return getPointFor(Optional.ofNullable(node.getEastNorth(getProjection()))
+                    .orElseThrow(IllegalArgumentException::new));
         } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) {
             throw BugReport.intercept(e).put("node", node);