diff --git a/phpdbg_cmd.c b/phpdbg_cmd.c
index b324079f271..d96ada36cd3 100644
--- a/phpdbg_cmd.c
+++ b/phpdbg_cmd.c
@@ -342,7 +342,10 @@ int phpdbg_do_cmd(const phpdbg_command_t *command, phpdbg_input_t *input TSRMLS_
 						}
 						
 						efree(sub.string);
-					} else {
+					}
+					
+					/* no sub command found */
+					{
 						char *store = input->string;
 						
 						input->string += input->argv[0]->length;
diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c
index b06cb059e1e..8ccea7d5948 100644
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@ -854,7 +854,10 @@ PHPDBG_COMMAND(help) /* {{{ */
 			phpdbg_help_footer();
 		} break;
 
-		phpdbg_default_switch_case();
+		default: {
+			phpdbg_error(
+				"No help can be found for the subject \"%s\"", param->str);
+		}
 	}
 
 	return SUCCESS;