diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 519665cd7ee3136e3593a198444d71b56316712c..a56f85774f5090a8f889b3433e824ad4db479b61 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -3397,7 +3397,7 @@ class LUQueryConfigValues(NoHooksLU):
       elif field == "drain_flag":
         entry = os.path.exists(constants.JOB_QUEUE_DRAIN_FILE)
       elif field == "watcher_pause":
-        return utils.ReadWatcherPauseFile(constants.WATCHER_PAUSEFILE)
+        entry = utils.ReadWatcherPauseFile(constants.WATCHER_PAUSEFILE)
       else:
         raise errors.ParameterError(field)
       values.append(entry)
diff --git a/scripts/gnt-cluster b/scripts/gnt-cluster
index 53bea1a2c25cdb2d3f82cb83bfaeb6aedd1e7fb8..22f28b7e78101ed303818be054f8b1806807d472 100755
--- a/scripts/gnt-cluster
+++ b/scripts/gnt-cluster
@@ -206,6 +206,7 @@ def ShowClusterMaster(opts, args):
   ToStdout(master)
   return 0
 
+
 def _PrintGroupedParams(paramsdict):
   """Print Grouped parameters (be, nic, disk) by group.
 
@@ -218,6 +219,7 @@ def _PrintGroupedParams(paramsdict):
     for item, val in gr_dict.iteritems():
       ToStdout("      %s: %s", item, val)
 
+
 def ShowClusterConfig(opts, args):
   """Shows cluster information.
 
@@ -594,7 +596,7 @@ def WatcherOps(opts, args):
 
   elif command == "info":
     result = client.QueryConfigValues(["watcher_pause"])
-    _ShowWatcherPause(result)
+    _ShowWatcherPause(result[0])
 
   else:
     raise errors.OpPrereqError("Command '%s' is not valid." % command,