1 files changed, 9 insertions, 6 deletions
diff --git a/client.c b/client.c
index c7774177..551a01b2 100644
--- a/client.c
+++ b/client.c
@@ -252,13 +252,16 @@ client_main(struct event_base *base, int argc, char **argv, int flags,
 		 * flag.
 		 */
 		cmdlist = cmd_list_parse(argc, argv, NULL, 0, &cause);
-		if (cmdlist != NULL) {
-			TAILQ_FOREACH(cmd, &cmdlist->list, qentry) {
-				if (cmd->entry->flags & CMD_STARTSERVER)
-					cmdflags |= CMD_STARTSERVER;
-			}
-			cmd_list_free(cmdlist);
+		if (cmdlist == NULL) {
+			fprintf(stderr, "%s\n", cause);
+			return (1);
+		}
+		cmdflags &= ~CMD_STARTSERVER;
+		TAILQ_FOREACH(cmd, &cmdlist->list, qentry) {
+			if (cmd->entry->flags & CMD_STARTSERVER)
+				cmdflags |= CMD_STARTSERVER;
 		}
+		cmd_list_free(cmdlist);
 	}
 
 	/* Create client process structure (starts logging). */