Index: /applications/editors/josm/plugins/indoorhelper/src/model/IndoorHelperModel.java
===================================================================
--- /applications/editors/josm/plugins/indoorhelper/src/model/IndoorHelperModel.java	(revision 35227)
+++ /applications/editors/josm/plugins/indoorhelper/src/model/IndoorHelperModel.java	(revision 35228)
@@ -121,20 +121,21 @@
      */
     public void addTagsToOSM(IndoorObject object) {
-
-        if (!MainApplication.getLayerManager().getEditDataSet().selectionEmpty() &&
-                !OsmDataManager.getInstance().getInProgressSelection().isEmpty()) {
-            List<Tag> tags = this.getObjectTags(object);
-
-            //Increment the counter for the presets
-            this.counter.count(object);
-
-            //Add the tags to the current selection
-            for (Tag t : tags) {
-                UndoRedoHandler.getInstance().add(new ChangePropertyCommand(
-                        OsmDataManager.getInstance().getInProgressSelection(), t.getKey(), t.getValue()));
-            }
-        //If the selected dataset ist empty
-        } else if (MainApplication.getLayerManager().getEditDataSet().selectionEmpty()) {
-            JOptionPane.showMessageDialog(null, tr("No data selected."), tr("Error"), JOptionPane.ERROR_MESSAGE);
+        DataSet editDataSet = MainApplication.getLayerManager().getEditDataSet();
+        if (editDataSet != null) {
+            Collection<OsmPrimitive> selection = OsmDataManager.getInstance().getInProgressSelection();
+            if (!editDataSet.selectionEmpty() && !selection.isEmpty()) {
+                List<Tag> tags = this.getObjectTags(object);
+
+                //Increment the counter for the presets
+                this.counter.count(object);
+
+                //Add the tags to the current selection
+                for (Tag t : tags) {
+                    UndoRedoHandler.getInstance().add(new ChangePropertyCommand(selection, t.getKey(), t.getValue()));
+                }
+            //If the selected dataset ist empty
+            } else if (editDataSet.selectionEmpty()) {
+                JOptionPane.showMessageDialog(null, tr("No data selected."), tr("Error"), JOptionPane.ERROR_MESSAGE);
+            }
         }
     }