Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 12090)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 12091)
@@ -1301,5 +1301,5 @@
     public Collection<? extends OsmPrimitive> getPreservedPrimitives() {
         DataSet ds = getLayerManager().getEditDataSet();
-        return ds != null ? ds.getSelected() : null;
+        return ds != null ? ds.getSelected() : Collections.emptySet();
     }