Index: trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterManager.java	(revision 17037)
+++ trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterManager.java	(revision 17039)
@@ -224,5 +224,8 @@
 
     private void removeAllButtons() {
-        buttons.values().forEach(MainApplication.getMap().mapView::remove);
+        MapFrame map= MainApplication.getMap();
+        if (map != null) {
+            buttons.values().forEach(map.mapView::remove);
+        }
         buttons.clear();
     }