Index: /applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/DrawBuildingAction.java
===================================================================
--- /applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/DrawBuildingAction.java	(revision 35820)
+++ /applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/DrawBuildingAction.java	(revision 35821)
@@ -112,5 +112,5 @@
                 MapFrame map = MainApplication.getMap();
                 // Don't change cursor when mode has changed already
-                if (map != null && !(map.mapMode instanceof DrawBuildingAction))
+                if (map == null || !(map.mapMode instanceof DrawBuildingAction))
                     return;
                 map.mapView.setCursor(c);