Index: madwifi-ng-r2420-20070602/net80211/ieee80211_beacon.c
===================================================================
--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_beacon.c	2007-06-04 13:21:57.501235152 +0200
+++ madwifi-ng-r2420-20070602/net80211/ieee80211_beacon.c	2007-06-04 13:21:59.411944680 +0200
@@ -512,7 +512,7 @@
 			vap->iv_flags &= ~IEEE80211_F_XRUPDATE;
 		}
 #endif
-		if (ic->ic_flags_ext & IEEE80211_FEXT_ERPUPDATE) {
+		if ((ic->ic_flags_ext & IEEE80211_FEXT_ERPUPDATE) && (bo->bo_erp != NULL)) {
 			(void) ieee80211_add_erp(bo->bo_erp, ic);
 			ic->ic_flags_ext &= ~IEEE80211_FEXT_ERPUPDATE;
 		}