diff --git a/gns3server/compute/base_manager.py b/gns3server/compute/base_manager.py
index 59e9c90a..4dd8ae36 100644
--- a/gns3server/compute/base_manager.py
+++ b/gns3server/compute/base_manager.py
@@ -335,11 +335,14 @@ class BaseManager:
         :returns: Node instance
         """
 
+        node = None
         try:
-            node = yield from self.close_node(node_id)
+            node = self.get_node(node_id)
+            yield from self.close_node(node_id)
         finally:
-            node.project.emit("node.deleted", node)
-        yield from node.project.remove_node(node)
+            if node:
+                node.project.emit("node.deleted", node)
+                yield from node.project.remove_node(node)
         if node.id in self._nodes:
             del self._nodes[node.id]
         return node