Index: trunk/src/org/openstreetmap/josm/gui/MapView.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 11764)
+++ trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 11765)
@@ -473,4 +473,14 @@
         }
 
+        try {
+            drawMapContent(g);
+        } catch (RuntimeException e) {
+            throw BugReport.intercept(e).put("visibleLayers", layerManager::getVisibleLayersInZOrder)
+                    .put("temporaryLayers", temporaryLayers);
+        }
+        super.paint(g);
+    }
+
+    private void drawMapContent(Graphics g) {
         List<Layer> visibleLayers = layerManager.getVisibleLayersInZOrder();
 
@@ -586,5 +596,4 @@
             Main.error(e);
         }
-        super.paint(g);
     }