diff --git a/src/redis-cli.c b/src/redis-cli.c
index 19627d7ab..48a2f915f 100644
--- a/src/redis-cli.c
+++ b/src/redis-cli.c
@@ -1169,6 +1169,7 @@ static sds addHintForRepeatedArgument(sds hint, cliCommandArg *arg) {
     hint = sdscat(hint, "[");
 
     if (arg->flags & CMD_ARG_MULTIPLE_TOKEN) {
+        assert(arg->token);
         hint = sdscat_orempty(hint, arg->token);
         if (arg->type != ARG_TYPE_PURE_TOKEN) {
             hint = sdscat(hint, " ");
diff --git a/utils/generate-command-code.py b/utils/generate-command-code.py
index 76c8c3b15..d9826aabd 100755
--- a/utils/generate-command-code.py
+++ b/utils/generate-command-code.py
@@ -207,6 +207,7 @@ class Argument(object):
                 s += "CMD_ARG_MULTIPLE|"
             if self.desc.get("multiple_token", False):
                 assert self.desc.get("multiple", False)  # Sanity
+                assert "token" in self.desc
                 s += "CMD_ARG_MULTIPLE_TOKEN|"
             return s[:-1] if s else "CMD_ARG_NONE"