Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java	(revision 11806)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java	(revision 11807)
@@ -259,6 +259,8 @@
                         .build());
             }
-            // TODO: Check coherence of context against maxspeed
-            // TODO: Check coherence of context against highway
+            if (testContextHighway) {
+                // TODO: Check coherence of context against maxspeed
+                // TODO: Check coherence of context against highway
+            }
         }
     }
Index: /trunk/src/org/openstreetmap/josm/gui/MapView.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 11806)
+++ /trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 11807)
@@ -477,5 +477,5 @@
         try {
             drawMapContent(g);
-        } catch (RuntimeException e) {
+        } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) {
             throw BugReport.intercept(e).put("visibleLayers", layerManager::getVisibleLayersInZOrder)
                     .put("temporaryLayers", temporaryLayers);