Index: trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java	(revision 7326)
+++ trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java	(revision 7329)
@@ -166,5 +166,7 @@
         tile.setLoaded(true);
         needRedraw = true;
-        Main.map.repaint(100);
+        if (Main.map != null) {
+            Main.map.repaint(100);
+        }
         tileRequestsOutstanding.remove(tile);
         if (Main.isDebugEnabled()) {