diff --git a/client/X11/xf_interface.c b/client/X11/xf_interface.c
index 3d27a5b49..521c6b8b8 100644
--- a/client/X11/xf_interface.c
+++ b/client/X11/xf_interface.c
@@ -1428,6 +1428,14 @@ int freerdp_client_global_uninit()
 
 int freerdp_client_start(xfInfo* xfi)
 {
+	rdpSettings* settings = xfi->settings;
+
+	if (!settings->ServerHostname)
+	{
+		fprintf(stderr, "error: server hostname was not specified with /v:<server>[:port]\n");
+		return -1;
+	}
+
 	xfi->thread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) xf_thread, (void*) xfi->instance, 0, NULL);
 
 	return 0;
diff --git a/client/common/cmdline.c b/client/common/cmdline.c
index dc5e6a681..5451d3158 100644
--- a/client/common/cmdline.c
+++ b/client/common/cmdline.c
@@ -992,8 +992,8 @@ int freerdp_client_parse_command_line_arguments(int argc, char** argv, rdpSettin
 
 	if (!settings->ConnectionFile && !(arg->Flags & COMMAND_LINE_VALUE_PRESENT))
 	{
-		fprintf(stderr, "error: server hostname was not specified with /v:<server>[:port]\n");
-		return COMMAND_LINE_ERROR_MISSING_ARGUMENT;
+		//fprintf(stderr, "error: server hostname was not specified with /v:<server>[:port]\n");
+		//return COMMAND_LINE_ERROR_MISSING_ARGUMENT;
 	}
 
 	arg = args;