diff --git a/modules/operations/delete.js b/modules/operations/delete.js
index 6b8042a22..f916aa88c 100644
--- a/modules/operations/delete.js
+++ b/modules/operations/delete.js
@@ -44,13 +44,14 @@ export function operationDelete(selectedIDs, context) {
             }
         }
 
+        context.perform(action, annotation);
+
         if (nextSelectedID && context.hasEntity(nextSelectedID)) {
             context.enter(modeSelect(context, [nextSelectedID]));
         } else {
             context.enter(modeBrowse(context));
         }
 
-        context.perform(action, annotation);
     };
 
 
diff --git a/modules/svg/labels.js b/modules/svg/labels.js
index ab3865223..88adf4906 100644
--- a/modules/svg/labels.js
+++ b/modules/svg/labels.js
@@ -615,7 +615,8 @@ export function svgLabels(projection, context) {
 
         // hide labels along selected ways, or near selected vertices
         for (var i = 0; i < selectedIDs.length; i++) {
-            var entity = graph.entity(selectedIDs[i]);
+            var entity = graph.hasEntity(selectedIDs[i]);
+            if (!entity) continue;
             var geometry = entity.geometry(graph);
 
             if (geometry === 'line') {