diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
index f81f6f2..5d8409c 100644
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@@ -1015,7 +1015,8 @@
 		     wpa_s->current_ssid ? wpa_s->current_ssid->id : -1,
 		     wpa_s->wpa_state,
 		     MAC2STR(wpa_s->pending_bssid),
-		     wpa_s->current_ssid ? wpa_ssid_txt(wpa_s->current_ssid->ssid,
+		     wpa_s->current_ssid && wpa_s->current_ssid->ssid ?
+		     wpa_ssid_txt(wpa_s->current_ssid->ssid,
 		     wpa_s->current_ssid->ssid_len) : "");
 	if (wpa_s->wpa_state == WPA_COMPLETED) {
 		struct wpa_ssid *ssid = wpa_s->current_ssid;
diff --git a/wpa_supplicant/notify.c b/wpa_supplicant/notify.c
index 9376c7a..f613897 100644
--- a/wpa_supplicant/notify.c
+++ b/wpa_supplicant/notify.c
@@ -94,7 +94,8 @@
 		     wpa_s->current_ssid ? wpa_s->current_ssid->id : -1,
 		     new_state,
 		     MAC2STR(wpa_s->pending_bssid),
-		     wpa_s->current_ssid ? wpa_ssid_txt(wpa_s->current_ssid->ssid,
+		     wpa_s->current_ssid && wpa_s->current_ssid->ssid ?
+		     wpa_ssid_txt(wpa_s->current_ssid->ssid,
 		     wpa_s->current_ssid->ssid_len): "");
 #endif /* ANDROID */
 }