diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index 1ed6b433d8..9d2e1e238d 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -2448,7 +2448,7 @@ _complete_fcn_connection_master (ARGS_COMPLETE_FCN)
 			expected_type = nm_setting_connection_get_slave_type (s_con);
 	}
 
-	text_len = strlen (text);
+	text_len = text ? strlen (text) : 0;
 
 	result = g_new (char *, (2 * len) + 1);
 	for (i = 0, j = 0; i < len; i++) {