diff --git a/lib/cli.py b/lib/cli.py
index 0a27edd3543b35e9f99a2553bfc7bcdd9ddfa260..28d71a24eadd8d116f226290530db8a7dba3fcfb 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -427,6 +427,9 @@ def GenericMain(commands, override=None):
     except errors.OpExecError, err:
       logger.ToStderr("Failure: command execution error:\n%s" % str(err))
       result = 1
+    except errors.TagError, err:
+      logger.ToStderr("Failure: invalid tag(s) given:\n%s" % str(err))
+      result = 1
   finally:
     utils.Unlock('cmd')
     utils.LockCleanup()