diff --git a/src/main/io/serial_cli.c b/src/main/io/serial_cli.c
index 4d1fdb9364..c5b2eea77c 100644
--- a/src/main/io/serial_cli.c
+++ b/src/main/io/serial_cli.c
@@ -2502,7 +2502,7 @@ static void cliName(char *cmdline)
 {
     
     uint32_t len = strlen(cmdline);
-    if (*cmdline == 0) {
+    if (len == 0) {
         cliPrintf("name %s\r\n", masterConfig.name);
     } else if ('-' == cmdline[0]) {
         memset(masterConfig.name, '\0', MAX_NAME_LENGTH); 
diff --git a/src/main/io/serial_msp.c b/src/main/io/serial_msp.c
index 2db9951554..2feb08b052 100644
--- a/src/main/io/serial_msp.c
+++ b/src/main/io/serial_msp.c
@@ -1878,7 +1878,7 @@ static bool processInCommand(void)
         break;
         
     case MSP_SET_NAME:
-        memset(masterConfig.name, '\0', MAX_NAME_LENGTH);
+        memset(masterConfig.name, 0, MAX_NAME_LENGTH+1);
         for (i = 0; i < MIN(MAX_NAME_LENGTH, currentPort->dataSize); i++) {
             masterConfig.name[i] = read8();
         }