diff --git a/src/global_commands.c b/src/global_commands.c
index 91f2374..dd0a1f1 100644
--- a/src/global_commands.c
+++ b/src/global_commands.c
@@ -219,7 +219,7 @@ void cmd_nick(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MA
 {
     /* check arguments */
     if (argc < 1) {
-      wprintw(window, "Invalid syntax.\n");
+      wprintw(window, "Invalid name.\n");
       return;
     }
 
@@ -232,6 +232,11 @@ void cmd_nick(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MA
         nick[len] = L'\0';
     }
 
+    if(!len) {
+      wprintw(window, "Invalid name.\n");
+      return;
+    }
+
     if (len > TOXIC_MAX_NAME_LENGTH) {
         nick[TOXIC_MAX_NAME_LENGTH] = L'\0';
         len = TOXIC_MAX_NAME_LENGTH;