Index: trunk/src/org/openstreetmap/josm/gui/MapView.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 412)
+++ trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 414)
@@ -179,5 +179,5 @@
 				l.paint(g, this);
 		}
-		if (getActiveLayer().visible)
+		if (getActiveLayer() != null && getActiveLayer().visible)
 			getActiveLayer().paint(g, this);