diff --git a/lib/cli.py b/lib/cli.py
index 14681a06a2bd153a215712a0d2eac04e86accb05..50bb1580e7c8de423d6240d8c74b45ac42d11651 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -1901,6 +1901,9 @@ def FormatError(err):
                "%s" % msg)
   elif isinstance(err, errors.JobLost):
     obuf.write("Error checking job status: %s" % msg)
+  elif isinstance(err, errors.QueryFilterParseError):
+    obuf.write("Error while parsing query filter: %s\n" % err.args[0])
+    obuf.write("\n".join(err.GetDetails()))
   elif isinstance(err, errors.GenericError):
     obuf.write("Unhandled Ganeti error: %s" % msg)
   elif isinstance(err, JobSubmittedException):