diff --git a/src/sentinel.c b/src/sentinel.c
index c820169a..be77f061 100644
--- a/src/sentinel.c
+++ b/src/sentinel.c
@@ -3482,6 +3482,11 @@ void sentinelSetCommand(client *c) {
             sds oldname = c->argv[++j]->ptr;
             sds newname = c->argv[++j]->ptr;
 
+            if ((sdslen(oldname) == 0) || (sdslen(newname) == 0)) {
+                badarg = sdslen(newname) ? j-1 : j;
+                goto badfmt;
+            }
+
             /* Remove any older renaming for this command. */
             dictDelete(ri->renamed_commands,oldname);