Index: /applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/actions/mapmode/Address.java
===================================================================
--- /applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/actions/mapmode/Address.java	(revision 35131)
+++ /applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/actions/mapmode/Address.java	(revision 35132)
@@ -18,4 +18,5 @@
 import java.awt.event.WindowEvent;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -278,6 +279,9 @@
 
     private void addStreetNameOrRelation(OsmPrimitive osm, Collection<Command> cmds) {
+        DataSet ds = OsmDataManager.getInstance().getEditDataSet();
         if (Config.getPref().getBoolean("cadastrewms.addr.dontUseRelation", false)) {
-            cmds.add(new ChangePropertyCommand(osm, tagHouseStreet, inputStreet.getText()));
+            Map<String, String> tags = new HashMap<>();
+            tags.put(tagHouseStreet, inputStreet.getText());
+            cmds.add(new ChangePropertyCommand(ds, Arrays.asList(osm), tags));
         } else if (selectedWay != null) {
             Relation selectedRelation = findRelationAddr(selectedWay);
@@ -295,5 +299,5 @@
                 newRel.addMember(new RelationMember(relationAddrStreetRole, selectedWay));
                 newRel.addMember(new RelationMember(relationMemberHouse, osm));
-                cmds.add(new AddCommand(OsmDataManager.getInstance().getEditDataSet(), newRel));
+                cmds.add(new AddCommand(ds, newRel));
             }
         }