diff --git a/src/helper/command.c b/src/helper/command.c
index d4f6a0a52..43c5a0ffb 100644
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -62,12 +62,12 @@ static inline bool jimcmd_is_proc(Jim_Cmd *cmd)
 	return cmd->isproc;
 }
 
-static inline bool jimcmd_is_ocd_command(Jim_Cmd *cmd)
+bool jimcmd_is_oocd_command(Jim_Cmd *cmd)
 {
 	return !cmd->isproc && cmd->u.native.cmdProc == jim_command_dispatch;
 }
 
-static inline void *jimcmd_privdata(Jim_Cmd *cmd)
+void *jimcmd_privdata(Jim_Cmd *cmd)
 {
 	return cmd->isproc ? NULL : cmd->u.native.privData;
 }
@@ -261,7 +261,7 @@ static struct command *command_find_from_name(Jim_Interp *interp, const char *na
 	Jim_IncrRefCount(jim_name);
 	Jim_Cmd *cmd = Jim_GetCommand(interp, jim_name, JIM_NONE);
 	Jim_DecrRefCount(interp, jim_name);
-	if (!cmd || jimcmd_is_proc(cmd) || !jimcmd_is_ocd_command(cmd))
+	if (!cmd || jimcmd_is_proc(cmd) || !jimcmd_is_oocd_command(cmd))
 		return NULL;
 
 	return jimcmd_privdata(cmd);
@@ -1020,7 +1020,7 @@ static int jim_command_mode(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 		Jim_Cmd *cmd = Jim_GetCommand(interp, s, JIM_NONE);
 		Jim_DecrRefCount(interp, s);
 		free(full_name);
-		if (!cmd || !(jimcmd_is_proc(cmd) || jimcmd_is_ocd_command(cmd))) {
+		if (!cmd || !(jimcmd_is_proc(cmd) || jimcmd_is_oocd_command(cmd))) {
 			Jim_SetResultString(interp, "unknown", -1);
 			return JIM_OK;
 		}
diff --git a/src/helper/command.h b/src/helper/command.h
index 068df9d0e..719c94b6b 100644
--- a/src/helper/command.h
+++ b/src/helper/command.h
@@ -84,6 +84,17 @@ struct command_invocation {
 	Jim_Obj *output;
 };
 
+/**
+ * Return true if the command @c cmd is registered by OpenOCD.
+ */
+bool jimcmd_is_oocd_command(Jim_Cmd *cmd);
+
+/**
+ * Return the pointer to the command's private data specified during the
+ * registration of command @a cmd .
+ */
+void *jimcmd_privdata(Jim_Cmd *cmd);
+
 /**
  * Command handlers may be defined with more parameters than the base
  * set provided by command.c.  This macro uses C99 magic to allow
diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c
index acb57efd1..2ad3791d7 100644
--- a/src/server/telnet_server.c
+++ b/src/server/telnet_server.c
@@ -500,22 +500,18 @@ static void telnet_auto_complete(struct connection *connection)
 		bool ignore_cmd = false;
 		Jim_Cmd *jim_cmd = Jim_GetCommand(command_context->interp, elem, JIM_NONE);
 
-		if (!jim_cmd)
+		if (!jim_cmd) {
+			/* Why we are here? Let's ignore it! */
 			ignore_cmd = true;
-		else {
-			if (!jim_cmd->isproc) {
-				/* ignore commands without handler
-				 * and those with COMMAND_CONFIG mode */
-				/* FIXME it's better to use jimcmd_is_ocd_command(jim_cmd)
-				 * or command_find_from_name(command_context->interp, name) */
-				struct command *cmd = jim_cmd->u.native.privData;
-				if (!cmd)
-					ignore_cmd = true;
-				/* make Valgrind happy by checking that cmd is not NULL  */
-				else if (cmd != NULL && !cmd->handler && !cmd->jim_handler)
-					ignore_cmd = true;
-				else if (cmd != NULL && cmd->mode == COMMAND_CONFIG)
-					ignore_cmd = true;
+		} else if (jimcmd_is_oocd_command(jim_cmd)) {
+			struct command *cmd = jimcmd_privdata(jim_cmd);
+
+			if (cmd && !cmd->handler && !cmd->jim_handler) {
+				/* Initial part of a multi-word command. Ignore it! */
+				ignore_cmd = true;
+			} else if (cmd && cmd->mode == COMMAND_CONFIG) {
+				/* Not executable after config phase. Ignore it! */
+				ignore_cmd = true;
 			}
 		}