diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 57dcff0485cef717a9e13d8e4d5f9d7537d0ef71..8df1e144731061e713d394838a90bfb094a5cd6f 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -1940,7 +1940,11 @@ class LURemoveNode(LogicalUnit):
       "NODE_NAME": self.op.node_name,
       }
     all_nodes = self.cfg.GetNodeList()
-    all_nodes.remove(self.op.node_name)
+    try:
+      all_nodes.remove(self.op.node_name)
+    except ValueError:
+      logging.warning("Node %s which is about to be removed not found"
+                      " in the all nodes list", self.op.node_name)
     return env, all_nodes, all_nodes
 
   def CheckPrereq(self):