diff --git a/reactos/base/shell/cmd/cmd.c b/reactos/base/shell/cmd/cmd.c
index 179c159e3f3..db43c0d26b5 100644
--- a/reactos/base/shell/cmd/cmd.c
+++ b/reactos/base/shell/cmd/cmd.c
@@ -453,7 +453,7 @@ Execute (LPTSTR Full, LPTSTR First, LPTSTR Rest, PARSED_COMMAND *Cmd)
 	/* search the PATH environment variable for the binary */
 	if (!SearchForExecutable (first, szFullName))
 	{
-			error_bad_command ();
+			error_bad_command (first);
 			cmd_free (first);
 			cmd_free (rest);
 			cmd_free (full);
@@ -531,7 +531,7 @@ Execute (LPTSTR Full, LPTSTR First, LPTSTR Rest, PARSED_COMMAND *Cmd)
 			if (!RunFile(full))
 			{
 				TRACE ("[ShellExecute failed!: %s]\n", debugstr_aw(full));
-				error_bad_command ();
+				error_bad_command (first);
                                 nErrorLevel = 1;
 			}
                         else
diff --git a/reactos/base/shell/cmd/cmd.h b/reactos/base/shell/cmd/cmd.h
index de050992ce4..9f17f2a783f 100644
--- a/reactos/base/shell/cmd/cmd.h
+++ b/reactos/base/shell/cmd/cmd.h
@@ -214,7 +214,7 @@ INT  CommandEchoserr (LPTSTR);
 VOID ErrorMessage (DWORD, LPTSTR, ...);
 
 VOID error_no_pipe (VOID);
-VOID error_bad_command (VOID);
+VOID error_bad_command (LPTSTR);
 VOID error_invalid_drive (VOID);
 VOID error_req_param_missing (VOID);
 VOID error_sfile_not_found (LPTSTR);
diff --git a/reactos/base/shell/cmd/error.c b/reactos/base/shell/cmd/error.c
index 70963bb2102..35e4ec543d5 100644
--- a/reactos/base/shell/cmd/error.c
+++ b/reactos/base/shell/cmd/error.c
@@ -118,9 +118,9 @@ VOID error_invalid_drive (VOID)
 }
 
 
-VOID error_bad_command (VOID)
+VOID error_bad_command (LPTSTR s)
 {
-	ConErrResPuts(STRING_ERROR_BADCOMMAND);
+	ConErrResPrintf(STRING_ERROR_BADCOMMAND, s);
 	nErrorLevel = 9009;
 }
 
diff --git a/reactos/base/shell/cmd/for.c b/reactos/base/shell/cmd/for.c
index 5489605260c..84cf68f1df4 100644
--- a/reactos/base/shell/cmd/for.c
+++ b/reactos/base/shell/cmd/for.c
@@ -268,7 +268,7 @@ static BOOL ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer)
 			InputFile = _tpopen(Start + 1, _T("r"));
 			if (!InputFile)
 			{
-				error_bad_command();
+				error_bad_command(Start + 1);
 				return FALSE;
 			}
 			FullInput = ReadFileContents(InputFile, Buffer);
diff --git a/reactos/base/shell/cmd/lang/de-DE.rc b/reactos/base/shell/cmd/lang/de-DE.rc
index ccb67621a39..32504955392 100644
--- a/reactos/base/shell/cmd/lang/de-DE.rc
+++ b/reactos/base/shell/cmd/lang/de-DE.rc
@@ -650,7 +650,7 @@ STRING_ERROR_FILE_NOT_FOUND,       "Datei wurde nicht gefunden\n"
 STRING_ERROR_REQ_PARAM_MISSING,    "Ben�tigter Parameter fehlt\n"
 STRING_ERROR_INVALID_DRIVE,        "Ung�ltige Laufwerksangaben\n"
 STRING_ERROR_INVALID_PARAM_FORMAT, "Ung�ltiges Parameterformat - %s\n"
-STRING_ERROR_BADCOMMAND,           "Ung�ltiger Befehl oder Dateiname\n"
+STRING_ERROR_BADCOMMAND,           "Ung�ltiger Befehl oder Dateiname - %s\n"
 STRING_ERROR_OUT_OF_MEMORY,        "Fehler: Zu wenig Speicher verf�gbar.\n"
 STRING_ERROR_CANNOTPIPE,           "Fehler: Cannot pipe! Tempor�re Datei kann nicht ge�ffnet werden!\n"
 STRING_ERROR_D_PAUSEMSG,           "Dr�cken Sie eine beliebige Taste . . ."
diff --git a/reactos/base/shell/cmd/lang/el-GR.rc b/reactos/base/shell/cmd/lang/el-GR.rc
index 0154b7580e1..4fea82e6038 100644
--- a/reactos/base/shell/cmd/lang/el-GR.rc
+++ b/reactos/base/shell/cmd/lang/el-GR.rc
@@ -664,7 +664,7 @@ STRING_ERROR_FILE_NOT_FOUND,       "
 STRING_ERROR_REQ_PARAM_MISSING,    "������ ���������� ����������\n"
 STRING_ERROR_INVALID_DRIVE,        "Invalid drive specification\n"
 STRING_ERROR_INVALID_PARAM_FORMAT, "�� ������ ����� ���������� - %s\n"
-STRING_ERROR_BADCOMMAND,           "��������� ������ � �����\n"
+STRING_ERROR_BADCOMMAND,           "��������� ������ � ����� - %s\n"
 STRING_ERROR_OUT_OF_MEMORY,        "Out of memory error.\n"
 STRING_ERROR_CANNOTPIPE,           "������!  Cannot pipe!  Cannot open temporary file!\n"
 STRING_ERROR_D_PAUSEMSG,           "������� ����������� ������� ��� �������� . . ."
diff --git a/reactos/base/shell/cmd/lang/en-US.rc b/reactos/base/shell/cmd/lang/en-US.rc
index 18d4bdd3057..797d1be9c6c 100644
--- a/reactos/base/shell/cmd/lang/en-US.rc
+++ b/reactos/base/shell/cmd/lang/en-US.rc
@@ -669,7 +669,7 @@ STRING_ERROR_FILE_NOT_FOUND,       "File not found\n"
 STRING_ERROR_REQ_PARAM_MISSING,    "Required parameter missing\n"
 STRING_ERROR_INVALID_DRIVE,        "Invalid drive specification\n"
 STRING_ERROR_INVALID_PARAM_FORMAT, "Invalid parameter format - %s\n"
-STRING_ERROR_BADCOMMAND,           "Bad command or filename\n"
+STRING_ERROR_BADCOMMAND,           "Bad command or filename - %s\n"
 STRING_ERROR_OUT_OF_MEMORY,        "Out of memory error.\n"
 STRING_ERROR_CANNOTPIPE,           "Error!  Cannot pipe!  Cannot open temporary file!\n"
 STRING_ERROR_D_PAUSEMSG,           "Press any key to continue . . ."
diff --git a/reactos/base/shell/cmd/lang/es-ES.rc b/reactos/base/shell/cmd/lang/es-ES.rc
index 985f93680fd..2c83e9d6a4e 100644
--- a/reactos/base/shell/cmd/lang/es-ES.rc
+++ b/reactos/base/shell/cmd/lang/es-ES.rc
@@ -624,7 +624,7 @@ STRING_ERROR_FILE_NOT_FOUND,       "Archivo no encontrado\n"
 STRING_ERROR_REQ_PARAM_MISSING,    "Pr�metro requerido no encontrado\n"
 STRING_ERROR_INVALID_DRIVE,        "Especificaci�n de unidad err�nea\n"
 STRING_ERROR_INVALID_PARAM_FORMAT, "Formato de par�metro err�neo - %s\n"
-STRING_ERROR_BADCOMMAND,           "Comando o nombre de archivo err�neo\n"
+STRING_ERROR_BADCOMMAND,           "Comando o nombre de archivo err�neo - %s\n"
 STRING_ERROR_OUT_OF_MEMORY,        "Error fuera de memoria.\n"
 STRING_ERROR_CANNOTPIPE,           "�Error!  �No se puede apilar!  �No se puede abrir el archivo temporal!\n"
 STRING_ERROR_D_PAUSEMSG,           "Pulsa una tecla para continuar . . ."
diff --git a/reactos/base/shell/cmd/lang/fr-FR.rc b/reactos/base/shell/cmd/lang/fr-FR.rc
index 9b39eb46f63..cb9a1003cfc 100644
--- a/reactos/base/shell/cmd/lang/fr-FR.rc
+++ b/reactos/base/shell/cmd/lang/fr-FR.rc
@@ -682,7 +682,7 @@ STRING_ERROR_FILE_NOT_FOUND,       "Fichier non trouv
 STRING_ERROR_REQ_PARAM_MISSING,    "Param�tre requis manquant\n"
 STRING_ERROR_INVALID_DRIVE,        "Lecteur sp�cifi� introuvable\n"
 STRING_ERROR_INVALID_PARAM_FORMAT, "Format de param�tre incorrect - %s\n"
-STRING_ERROR_BADCOMMAND,           "Commande ou nom de fichier inconnu\n"
+STRING_ERROR_BADCOMMAND,           "Commande ou nom de fichier inconnu - %s\n"
 STRING_ERROR_OUT_OF_MEMORY,        "Pas assez de m�moire.\n"
 STRING_ERROR_CANNOTPIPE,           "Erreur !  Impossible de cha�ner !  �chec � l'ouverture du fichier temporaire!\n"
 STRING_ERROR_D_PAUSEMSG,           "Appuyez sur une touche pour continuer . . ."
diff --git a/reactos/base/shell/cmd/lang/hu-HU.rc b/reactos/base/shell/cmd/lang/hu-HU.rc
index 9834a0a764f..fe9dfabf7b5 100644
--- a/reactos/base/shell/cmd/lang/hu-HU.rc
+++ b/reactos/base/shell/cmd/lang/hu-HU.rc
@@ -604,7 +604,7 @@ STRING_ERROR_FILE_NOT_FOUND,       "Az 
 STRING_ERROR_REQ_PARAM_MISSING,    "Egy sz�ks�ges param�ter hi�nyzik\n"
 STRING_ERROR_INVALID_DRIVE,        "�rv�nytelen meghajt�\n"
 STRING_ERROR_INVALID_PARAM_FORMAT, "�rv�nytelen param�ter megad�s - %s\n"
-STRING_ERROR_BADCOMMAND,           "Ismeretlen parancs vagy �llom�ny n�v\n"
+STRING_ERROR_BADCOMMAND,           "Ismeretlen parancs vagy �llom�ny n�v - %s\n"
 STRING_ERROR_OUT_OF_MEMORY,        "Nincs el�g mem�ria.\n"
 STRING_ERROR_CANNOTPIPE,           "Error!  Cannot pipe!  Cannot open temporary �llom�ny!\n"
 STRING_ERROR_D_PAUSEMSG,           "A folytat�shoz nyomj meg egy billenty�t . . ."
diff --git a/reactos/base/shell/cmd/lang/id-ID.rc b/reactos/base/shell/cmd/lang/id-ID.rc
index d5f5357259b..93c8eef1c69 100644
--- a/reactos/base/shell/cmd/lang/id-ID.rc
+++ b/reactos/base/shell/cmd/lang/id-ID.rc
@@ -626,7 +626,7 @@ STRING_ERROR_FILE_NOT_FOUND,       "File tidak ditemukan\n"
 STRING_ERROR_REQ_PARAM_MISSING,    "Parameter yang diperlukan kurang\n"
 STRING_ERROR_INVALID_DRIVE,        "Spesifikasi drive tidak benar\n"
 STRING_ERROR_INVALID_PARAM_FORMAT, "Format parameter tidak benar - %s\n"
-STRING_ERROR_BADCOMMAND,           "Perintah atau nama file salah\n"
+STRING_ERROR_BADCOMMAND,           "Perintah atau nama file salah - %s\n"
 STRING_ERROR_OUT_OF_MEMORY,        "Kesalahan kekurangan memori.\n"
 STRING_ERROR_CANNOTPIPE,           "Salah!  Tidak bisa melakukan pipe!  Tidak bisa membuka file temporal!\n"
 STRING_ERROR_D_PAUSEMSG,           "Tekan tombol untuk melanjutkan . . ."
diff --git a/reactos/base/shell/cmd/lang/it-IT.rc b/reactos/base/shell/cmd/lang/it-IT.rc
index 3aef3da45ae..8bbe450169b 100644
--- a/reactos/base/shell/cmd/lang/it-IT.rc
+++ b/reactos/base/shell/cmd/lang/it-IT.rc
@@ -672,7 +672,7 @@ STRING_ERROR_FILE_NOT_FOUND,       "File non trovato\n"
 STRING_ERROR_REQ_PARAM_MISSING,    "Parametro obbligatorio mancante\n"
 STRING_ERROR_INVALID_DRIVE,        "Disco non valido\n"
 STRING_ERROR_INVALID_PARAM_FORMAT, "Formato dei parametri non valido - %s\n"
-STRING_ERROR_BADCOMMAND,           "Comando o nome di file errato\n"
+STRING_ERROR_BADCOMMAND,           "Comando o nome di file errato - %s\n"
 STRING_ERROR_OUT_OF_MEMORY,        "Errore di memoria esaurita.\n"
 STRING_ERROR_CANNOTPIPE,           "Errore!  Impossibile ridirigere!  Impossibile aprire un file temporaneo!\n"
 STRING_ERROR_D_PAUSEMSG,           "Premi un tasto per continuare . . ."
diff --git a/reactos/base/shell/cmd/lang/ja-JP.rc b/reactos/base/shell/cmd/lang/ja-JP.rc
index 1be9d3a2cad..ccc426c1413 100644
--- a/reactos/base/shell/cmd/lang/ja-JP.rc
+++ b/reactos/base/shell/cmd/lang/ja-JP.rc
@@ -633,7 +633,7 @@ STRING_ERROR_FILE_NOT_FOUND,       "
 STRING_ERROR_REQ_PARAM_MISSING,    "�K�v�ȃp�����[�^���s�����Ă��܂��B\n"
 STRING_ERROR_INVALID_DRIVE,        "�����ȃh���C�u�w��ł��B\n"
 STRING_ERROR_INVALID_PARAM_FORMAT, "�����ȃp�����[�^�̏����ł��B - %s\n"
-STRING_ERROR_BADCOMMAND,           "�R�}���h�܂��̓t�@�C�������Ԉ���Ă��܂��B\n"
+STRING_ERROR_BADCOMMAND,           "�R�}���h�܂��̓t�@�C�������Ԉ���Ă��܂��B - %s\n"
 STRING_ERROR_OUT_OF_MEMORY,        "�������s���G���[�B\n"
 STRING_ERROR_CANNOTPIPE,           "�G���[!  �p�C�v�ł��܂���!  �ꎞ�t�@�C�����J���܂���!\n"
 STRING_ERROR_D_PAUSEMSG,           "���s����ɂ͉����L�[�������Ă������� . . ."
diff --git a/reactos/base/shell/cmd/lang/no-NO.rc b/reactos/base/shell/cmd/lang/no-NO.rc
index 0206b5c0671..654422b53f7 100644
--- a/reactos/base/shell/cmd/lang/no-NO.rc
+++ b/reactos/base/shell/cmd/lang/no-NO.rc
@@ -618,7 +618,7 @@ STRING_ERROR_FILE_NOT_FOUND,       "Filen ble ikke funnet\n"
 STRING_ERROR_REQ_PARAM_MISSING,    "Obligatorisk parameter mangler\n"
 STRING_ERROR_INVALID_DRIVE,        "Ugyldig stasjon angitt\n"
 STRING_ERROR_INVALID_PARAM_FORMAT, "Ugyldig parameter format - %s\n"
-STRING_ERROR_BADCOMMAND,           "Feil kommando eller filnavn\n"
+STRING_ERROR_BADCOMMAND,           "Feil kommando eller filnavn - %s\n"
 STRING_ERROR_OUT_OF_MEMORY,        "Feil: Minne fullt.\n"
 STRING_ERROR_CANNOTPIPE,           "Feil! Kan ikke bruke datakanal! Kan ikke �pne midlertidig fil!\n"
 STRING_ERROR_D_PAUSEMSG,           "Trykk en tast for � fortsette . . ."
diff --git a/reactos/base/shell/cmd/lang/pl-PL.rc b/reactos/base/shell/cmd/lang/pl-PL.rc
index d13b2109cab..3e9ec5ef289 100644
--- a/reactos/base/shell/cmd/lang/pl-PL.rc
+++ b/reactos/base/shell/cmd/lang/pl-PL.rc
@@ -624,7 +624,7 @@ STRING_ERROR_FILE_NOT_FOUND,       "Plik nie zosta
 STRING_ERROR_REQ_PARAM_MISSING,    "Brak wymaganego parametru\n"
 STRING_ERROR_INVALID_DRIVE,        "Nieprawid�owe okre�lenie nap�du\n"
 STRING_ERROR_INVALID_PARAM_FORMAT, "Niew�a�ciwy format parametru - %s\n"
-STRING_ERROR_BADCOMMAND,           "Nieprawid�owa komenda lub nazwa pliku\n"
+STRING_ERROR_BADCOMMAND,           "Nieprawid�owa komenda lub nazwa pliku - %s\n"
 STRING_ERROR_OUT_OF_MEMORY,        "B��d - brak pami�ci.\n"
 STRING_ERROR_CANNOTPIPE,           "B��d potok�w! Nie mo�na otworzy� pliku tymczasowego.\n"
 STRING_ERROR_D_PAUSEMSG,           "Naci�nij dowolny klawisz, aby kontynuowa� . . ."
diff --git a/reactos/base/shell/cmd/lang/ru-RU.rc b/reactos/base/shell/cmd/lang/ru-RU.rc
index 58882cfc5ff..2166d812807 100644
--- a/reactos/base/shell/cmd/lang/ru-RU.rc
+++ b/reactos/base/shell/cmd/lang/ru-RU.rc
@@ -631,7 +631,7 @@ STRING_ERROR_FILE_NOT_FOUND,       "
 STRING_ERROR_REQ_PARAM_MISSING,    "����������� ����������� ��������\n"
 STRING_ERROR_INVALID_DRIVE,        "��������� ����������� �����\n"
 STRING_ERROR_INVALID_PARAM_FORMAT, "��������� ������ ��������� - %s\n"
-STRING_ERROR_BADCOMMAND,           "������������ ������� ��� �������� ��� �����\n"
+STRING_ERROR_BADCOMMAND,           "������������ ������� ��� �������� ��� ����� - %s\n"
 STRING_ERROR_OUT_OF_MEMORY,        "�������� ������.\n"
 STRING_ERROR_CANNOTPIPE,           "������!  ���������� ������������ pipe!  ���������� ������� ��������� ����!\n"
 STRING_ERROR_D_PAUSEMSG,           "��� ����������� ������� ����� ������� . . ."
diff --git a/reactos/base/shell/cmd/lang/uk-UA.rc b/reactos/base/shell/cmd/lang/uk-UA.rc
index 94f9fbf45a7..d88ffc1d6ce 100644
--- a/reactos/base/shell/cmd/lang/uk-UA.rc
+++ b/reactos/base/shell/cmd/lang/uk-UA.rc
@@ -672,7 +672,7 @@ STRING_ERROR_FILE_NOT_FOUND,       "
 STRING_ERROR_REQ_PARAM_MISSING,    "³������� ����'������� ��������\n"
 STRING_ERROR_INVALID_DRIVE,        "Invalid drive specification\n"
 STRING_ERROR_INVALID_PARAM_FORMAT, "Invalid parameter format - %s\n"
-STRING_ERROR_BADCOMMAND,           "������ ������� ��� ��'� �����\n"
+STRING_ERROR_BADCOMMAND,           "������ ������� ��� ��'� ����� - %s\n"
 STRING_ERROR_OUT_OF_MEMORY,        "����������� ���'��.\n"
 STRING_ERROR_CANNOTPIPE,           "Error!  Cannot pipe!  Cannot open temporary file!\n"
 STRING_ERROR_D_PAUSEMSG,           "��������� ����-��� ������ ��� ����������� . . ."
diff --git a/reactos/base/shell/cmd/start.c b/reactos/base/shell/cmd/start.c
index dc680352c7c..8764ebf956a 100644
--- a/reactos/base/shell/cmd/start.c
+++ b/reactos/base/shell/cmd/start.c
@@ -214,7 +214,7 @@ INT cmd_start (LPTSTR Rest)
 	/* search the PATH environment variable for the binary */
 	if (!SearchForExecutable (rest, szFullName))
 	{
-		error_bad_command ();
+		error_bad_command(rest);
 
 		cmd_free(comspec);
 		return 1;