Index: applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java
===================================================================
--- applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java	(revision 36132)
+++ applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java	(revision 36134)
@@ -978,14 +978,7 @@
 
     private void removeAddressInterpolationWay() {
-
-        // Remove way - nodes of the way remain
-        commandGroup.add(DeleteCommand.delete(Collections.singleton(addrInterpolationWay)));
-
-        // Remove untagged nodes
-        for (int i = 1; i < addrInterpolationWay.getNodesCount()-1; i++) {
-            Node testNode = addrInterpolationWay.getNode(i);
-            if (!testNode.hasKeys()) {
-                commandGroup.add(DeleteCommand.delete(Collections.singleton(testNode)));
-            }
+        final Command deleteCommand = DeleteCommand.delete(Collections.singleton(addrInterpolationWay), true);
+        if (deleteCommand != null) {
+            commandGroup.add(deleteCommand);
         }