Index: applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/Building.java
===================================================================
--- applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/Building.java	(revision 36126)
+++ applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/Building.java	(revision 36132)
@@ -49,5 +49,5 @@
     private double width;
     private double heading;
-    private AngleSnap angleSnap = new AngleSnap();
+    private final AngleSnap angleSnap = new AngleSnap();
     private Double drawingAngle;
     private static final double EQUAL_NODE_DIST_TOLERANCE = 1e-6;
@@ -471,5 +471,5 @@
 
     private static void addAddress(Way w, Collection<Command> cmdList) {
-        if (ToolSettings.PROP_USE_ADDR_NODE.get()) {
+        if (Boolean.TRUE.equals(ToolSettings.PROP_USE_ADDR_NODE.get())) {
             Node addrNode = getAddressNode(w);
             if (addrNode != null) {
@@ -487,5 +487,5 @@
                     addressCmds.add(new ChangeMembersCommand(r, members));
                 }
-                addressCmds.add(new DeleteCommand(addrNode));
+                addressCmds.add(DeleteCommand.delete(Collections.singleton(addrNode)));
                 if (cmdList == null) {
                     Command c = new SequenceCommand(tr("Add address for building"), addressCmds);