Index: /trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java	(revision 16369)
+++ /trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java	(revision 16370)
@@ -100,5 +100,5 @@
                     final PropertiesMembershipChoiceDialog dialog = PropertiesMembershipChoiceDialog.showIfNecessary(
                             Collections.singleton(selectedNode), !selectedNode.isTagged());
-                    if (dialog != null) {
+                    if (dialog != null && dialog.getTags().isPresent()) {
                         unglueOneNodeAtMostOneWay(way, dialog);
                         return;