diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
index 6fe2956..a436c2a 100644
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
@@ -667,6 +667,7 @@
 				   NULL, first == -1)) {
 			wpa_printf(MSG_ERROR, "Failed to add BSS (BSSID="
 				   MACSTR ")", MAC2STR(hapd->own_addr));
+			hapd->interface_added = 0;
 			return -1;
 		}
 	}
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index e8bca8a..2d6272b 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -2905,6 +2905,8 @@
 			dl_list_add(&radio->ifaces, &wpa_s->radio_list);
 			return radio;
 		}
+
+		iface = iface->next;
 	}
 
 	wpa_printf(MSG_DEBUG, "Add interface %s to a new radio %s",