Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java	(revision 4411)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java	(revision 4412)
@@ -217,5 +217,5 @@
                 c += "_add";
             } else if(ctrl) {
-                c += osm.isSelected() ? "_rm" : "_add";
+                c += osm == null || osm.isSelected() ? "_rm" : "_add";
             }
             break;