diff --git a/wpa_supplicant/ap.c b/wpa_supplicant/ap.c
index 1623c8869..7621512e2 100644
--- a/wpa_supplicant/ap.c
+++ b/wpa_supplicant/ap.c
@@ -324,6 +324,8 @@ void wpa_supplicant_ap_rx_eapol(struct wpa_supplicant *wpa_s,
 
 int wpa_supplicant_ap_wps_pbc(struct wpa_supplicant *wpa_s, const u8 *bssid)
 {
+	if (!wpa_s->ap_iface)
+		return -1;
 	return hostapd_wps_button_pushed(wpa_s->ap_iface->bss[0]);
 }
 
@@ -333,6 +335,9 @@ int wpa_supplicant_ap_wps_pin(struct wpa_supplicant *wpa_s, const u8 *bssid,
 {
 	int ret, ret_len = 0;
 
+	if (!wpa_s->ap_iface)
+		return -1;
+
 	if (pin == NULL) {
 		unsigned int rpin = wps_generate_pin();
 		ret_len = os_snprintf(buf, buflen, "%d", rpin);