diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 333de53d6aee879e7d31aed42f89f73081b3e655..089cd36dbf999e325d4b78e288ab85e52e1b07dc 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -6649,7 +6649,7 @@ class LUQueryInstanceData(NoHooksLU):
     """Returns the status of a block device
 
     """
-    if self.op.static:
+    if self.op.static or not node:
       return None
 
     self.cfg.SetDiskID(dev, node)