diff --git a/degesch.c b/degesch.c
index 325ea83..1301a2d 100644
--- a/degesch.c
+++ b/degesch.c
@@ -7466,11 +7466,11 @@ show_servers_list (struct app_context *ctx)
 static bool
 handle_server_add (struct handler_args *a)
 {
-	char *name = cut_word (&a->arguments);
 	if (!*a->arguments)
 		return false;
 
 	struct app_context *ctx = a->ctx;
+	char *name = cut_word (&a->arguments);
 	if (check_server_name_for_addition (ctx, name))
 		server_add_new (ctx, name);
 	return true;