diff --git a/server/server.py b/server/server.py
index 02c6cd06e2af941cb41da46e469e10986dd9ebb2..fbb124e6d157e8f7baafa9fd26719a056cbf5e6a 100644
--- a/server/server.py
+++ b/server/server.py
@@ -59,10 +59,14 @@ while 1:
     name = len(nodes_info)+1
     data = str(gn.create_node(project_id, name, node_type))+str('END')
 
-  elif index == '04':
+  elif index[:2] == '04':
+    node_idx = int(index[2:4])
     nodes_info = gn.update_nodes_info()
-    node_id = nodes_info[-1].get('node_id')
-    data = str(gns3.node_delete(project_id, node_id))+str('END')
+    if node_idx>=0 and node_idx<len(nodes_info):
+      node_id = nodes_info[node_idx].get('node_id')
+      data = str(gns3.node_delete(project_id, node_id))+str('END')
+    else:
+      data = str('incorrect index')+str('END')
 
   elif index[:2] == '05':
     node_idx_1 = int(index[2:4])