Index: madwifi-ng-r2525-20070630/net80211/ieee80211_beacon.c
===================================================================
--- madwifi-ng-r2525-20070630.orig/net80211/ieee80211_beacon.c	2007-07-03 23:02:30.981980000 +0200
+++ madwifi-ng-r2525-20070630/net80211/ieee80211_beacon.c	2007-07-03 23:02:34.674210750 +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;
 		}