Index: trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java	(revision 3200)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java	(revision 3201)
@@ -490,5 +490,6 @@
                         if (!nodesToMerge.isEmpty()) {
                             Command cmd = MergeNodesAction.mergeNodes(Main.main.getEditLayer(),nodesToMerge, targetNode);
-                            Main.main.undoRedo.add(cmd);
+                            if(cmd != null)
+                                Main.main.undoRedo.add(cmd);
                         }
                     }
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java	(revision 3200)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java	(revision 3201)
@@ -307,5 +307,5 @@
             GeneralPath path = new GeneralPath();
             for (Way osm: ways){
-                if (osm.isUsable() && !osm.isFiltered()) {
+                if (osm.isUsable() && !osm.isFiltered() && !osm.isDisabled()) {
                     visitVirtual(path, osm);
                 }
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/SimplePaintVisitor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/SimplePaintVisitor.java	(revision 3200)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/SimplePaintVisitor.java	(revision 3201)
@@ -297,5 +297,5 @@
             GeneralPath path = new GeneralPath();
             for (Way osm: ways){
-                if (osm.isUsable() && !osm.isFiltered()) {
+                if (osm.isUsable() && !osm.isFiltered() && !osm.isDisabled()) {
                     visitVirtual(path, osm);
                 }