diff --git a/src/mod/server.mod/tclserv.c b/src/mod/server.mod/tclserv.c
index efff0bd22..e92d70726 100644
--- a/src/mod/server.mod/tclserv.c
+++ b/src/mod/server.mod/tclserv.c
@@ -583,7 +583,7 @@ static int tcl_server STDVAR {
   BADARGS(2, 5, " subcommand ?host ?port? ?password?");
   if (!strcmp(argv[1], "add")) {
     if (argc < 3) {
-      Tcl_SetResult(irp, "Subcommand add needs at least a server host", TCL_STATIC);
+      Tcl_SetResult(irp, "wrong # args: should be \"server add host ?port? ?password?\"", TCL_STATIC);
       return TCL_ERROR;
     }
     ret = add_server(argv[2], argc >= 4 && argv[3] ? argv[3] : "", argc >= 5 && argv[4] ? argv[4] : "");
@@ -604,7 +604,7 @@ static int tcl_server STDVAR {
     }
   } else if (!strcmp(argv[1], "remove")) {
     if (argc < 3) {
-      Tcl_SetResult(irp, "Subcommand remove needs at least a server host", TCL_STATIC);
+      Tcl_SetResult(irp, "wrong # args: should be \"server remove host ?port? ?password?\"", TCL_STATIC);
       return TCL_ERROR;
     }
     ret = del_server(argv[2], argc >= 4 && argv[3] ? argv[3] : "");