diff --git a/cli/src/connections.c b/cli/src/connections.c
index 1671d2aaaa..cfc36c40db 100644
--- a/cli/src/connections.c
+++ b/cli/src/connections.c
@@ -4580,7 +4580,9 @@ ask_check_property (const char *arg,
 
 	if (!arg) {
 		printf (_("Available properties: %s\n"), valid_props_str);
-		prop_name_user = g_strstrip (readline_x (EDITOR_PROMPT_PROPERTY));
+		prop_name_user = readline_x (EDITOR_PROMPT_PROPERTY);
+		if (prop_name_user)
+			g_strstrip (prop_name_user);
 	} else
 		prop_name_user = g_strdup (arg);