diff --git a/src/helper/command.c b/src/helper/command.c
index 137ac7ee6..c29f1130c 100644
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -1070,8 +1070,10 @@ static int jim_command_type(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 		Jim_SetResultString(interp, "native", -1);
 	else if (c->handler)
 		Jim_SetResultString(interp, "simple", -1);
-	else
+	else if (remaining == 0)
 		Jim_SetResultString(interp, "group", -1);
+	else
+		Jim_SetResultString(interp, "unknown", -1);
 
 	return JIM_OK;
 }
diff --git a/src/helper/startup.tcl b/src/helper/startup.tcl
index a7c0d5844..926d26b63 100644
--- a/src/helper/startup.tcl
+++ b/src/helper/startup.tcl
@@ -30,7 +30,7 @@ proc ocd_bouncer {name args} {
 		set errmsg [format "%s: command requires more arguments" \
 			[concat $name " " $args]]
 	} else {
-		set errmsg [format "Unknown command type: %s" $type]
+		set errmsg [format "invalid subcommand \"%s\"" $args]
 	}}}
 	return -code error $errmsg
 }