diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index c726bf15d7b984c7534472869b51dfb4c809313d..b6d223378b27e029337f86d453b8aa107edff9ea 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -1052,8 +1052,7 @@ class LURemoveNode(LogicalUnit):
     """
     node = self.cfg.GetNodeInfo(self.cfg.ExpandNodeName(self.op.node_name))
     if node is None:
-      logger.Error("Error: Node '%s' is unknown." % self.op.node_name)
-      return 1
+      raise errors.OpPrereqError, ("Node '%s' is unknown." % self.op.node_name)
 
     instance_list = self.cfg.GetInstanceList()