Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java	(revision 24140)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java	(revision 24141)
@@ -506,5 +506,7 @@
 			invalidate(workingSet);
 		} else {
-			invalidate(Main.main.getCurrentDataSet().allPrimitives());
+			if (Main.main.getCurrentDataSet() != null) {
+				invalidate(Main.main.getCurrentDataSet().allPrimitives());
+			}
 		}
 	}