diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 8f5216f5ecf67d451e055855c80d13ce92fc13ce..2400bc5bcb59c3c3fd6e41fab4a787b1895a74ed 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -1209,6 +1209,9 @@ class LUQueryNodeVolumes(NoHooksLU):
 
     output = []
     for node in nodenames:
+      if node not in volumes or not volumes[node]:
+        continue
+
       node_vols = volumes[node][:]
       node_vols.sort(key=lambda vol: vol['dev'])