diff --git a/client/mysql.cc b/client/mysql.cc
index e87fbaf8a41..f784f529c46 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -2452,9 +2452,11 @@ char *get_arg(char *line, my_bool get_next_arg)
       ptr++;
     if (*ptr == '\\') // short command was used
       ptr+= 2;
-    while (!my_isspace(system_charset_info, *ptr)) // skip command
+    while (*ptr &&!my_isspace(system_charset_info, *ptr)) // skip command
       ptr++;
   }
+  if (!*ptr)
+    return NullS;
   while (my_isspace(system_charset_info, *ptr))
     ptr++;
   if (*ptr == '\'' || *ptr == '\"' || *ptr == '`')