diff --git a/src/nm-device-wifi.c b/src/nm-device-wifi.c
index 9258f77c27..b4c84b548a 100644
--- a/src/nm-device-wifi.c
+++ b/src/nm-device-wifi.c
@@ -1465,13 +1465,12 @@ real_complete_connection (NMDevice *device,
 		 */
 		if (!nm_ap_complete_connection (ap,
 		                                connection,
-		                                is_manf_default_ssid (ssid),
+		                                ssid ? is_manf_default_ssid (ssid) : FALSE,
 		                                error))
 			return FALSE;
 	}
 
-	g_assert (ssid);
-	str_ssid = nm_utils_ssid_to_utf8 (ssid);
+	str_ssid = ssid ? nm_utils_ssid_to_utf8 (ssid) : g_strdup (_("<hidden>"));
 	format = g_strdup_printf ("%s %%d", str_ssid);
 
 	nm_utils_complete_generic (connection,