Index: /trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterManager.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterManager.java	(revision 12470)
+++ /trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterManager.java	(revision 12471)
@@ -47,4 +47,5 @@
 import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.NavigatableComponent.ZoomChangeListener;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Selector;
 import org.openstreetmap.josm.gui.widgets.OSDLabel;
@@ -354,5 +355,8 @@
             model.executeFilters();
             if (model.isChanged()) {
-                Main.getLayerManager().getEditLayer().invalidate();
+                OsmDataLayer editLayer = Main.getLayerManager().getEditLayer();
+                if (editLayer != null) {
+                    editLayer.invalidate();
+                }
             }
         }