Index: /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/RasterFiltersPlugin.java
===================================================================
--- /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/RasterFiltersPlugin.java	(revision 31634)
+++ /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/RasterFiltersPlugin.java	(revision 31635)
@@ -83,7 +83,4 @@
 			FiltersDownloader.initFilters();
 
-			LayerListDialog dialog = Main.map
-					.getToggleDialog(LayerListDialog.class);
-
 			if (action == null) {
 				action = new ShowLayerFiltersDialog();
@@ -97,4 +94,6 @@
 				filterButton.setEnabled(false);
 			}
+
+			LayerListDialog dialog = LayerListDialog.getInstance();
 
 			JPanel buttonRowPanel = (JPanel) ((JPanel) dialog.getComponent(2))
@@ -123,5 +122,7 @@
 
 			Container container = filterButton.getParent();
-			container.remove(filterButton);
+			if (container != null)
+				container.remove(filterButton);
+			
 			FiltersDownloader.destroyFilters();
 			filterButton = null;