diff --git a/lib/cli.py b/lib/cli.py
index c1b3e2453d7d326015264967b3ff26352e17dafd..dae3bf7e5baa9a47c826400a7c2934ff9e8096d6 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -412,7 +412,7 @@ def _ExtractTagsObject(opts, args):
     raise errors.ProgrammerError("tag_type not passed to _ExtractTagsObject")
   kind = opts.tag_type
   if kind == constants.TAG_CLUSTER:
-    retval = kind, kind
+    retval = kind, None
   elif kind in (constants.TAG_NODEGROUP,
                 constants.TAG_NODE,
                 constants.TAG_INSTANCE):
diff --git a/lib/opcodes.py b/lib/opcodes.py
index 2da68ce06c1a48075da19901480bbef9fe1624e2..5bdf85e952d18740f06a832484f5d07738ce7915 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -1815,7 +1815,7 @@ class OpTagsSet(OpCode):
   OP_PARAMS = [
     _PTagKind,
     _PTags,
-    # Name is only meaningful for nodes and instances
+    # Name is only meaningful for groups, nodes and instances
     ("name", ht.NoDefault, ht.TMaybeString,
      "Name of object where tag(s) should be added"),
     ]
@@ -1827,7 +1827,7 @@ class OpTagsDel(OpCode):
   OP_PARAMS = [
     _PTagKind,
     _PTags,
-    # Name is only meaningful for nodes and instances
+    # Name is only meaningful for groups, nodes and instances
     ("name", ht.NoDefault, ht.TMaybeString,
      "Name of object where tag(s) should be deleted"),
     ]