diff --git a/openbsc/src/libbsc/bsc_rf_ctrl.c b/openbsc/src/libbsc/bsc_rf_ctrl.c
index 59f31c9..0538482 100644
--- a/openbsc/src/libbsc/bsc_rf_ctrl.c
+++ b/openbsc/src/libbsc/bsc_rf_ctrl.c
@@ -108,7 +108,7 @@
 {
 	struct osmo_bsc_data *bsc_data = bts->network->bsc_data;
 
-	if (!bsc_data || !bsc_data->rf_ctrl)
+	if (!bsc_data)
 		return OSMO_BSC_RF_POLICY_UNKNOWN;
 
 	switch (bsc_data->rf_ctrl->policy) {
@@ -412,7 +412,7 @@
 	msc = signal_data;
 
 	/* check if we have the needed information */
-	if (!net->bsc_data || !net->bsc_data->rf_ctrl)
+	if (!net->bsc_data)
 		return 0;
 	if (msc->data->type != MSC_CON_TYPE_NORMAL)
 		return 0;
diff --git a/openbsc/src/libbsc/bsc_vty.c b/openbsc/src/libbsc/bsc_vty.c
index 0030764..2a4d0b3 100644
--- a/openbsc/src/libbsc/bsc_vty.c
+++ b/openbsc/src/libbsc/bsc_vty.c
@@ -210,11 +210,11 @@
 	dump_pchan_load_vty(vty, "    ", &pl);
 
 	/* show rf */
-	if (net->bsc_data && net->bsc_data->rf_ctrl)
+	if (net->bsc_data)
 		vty_out(vty, "  Last RF Command: %s%s",
 			net->bsc_data->rf_ctrl->last_state_command,
 			VTY_NEWLINE);
-	if (net->bsc_data && net->bsc_data->rf_ctrl)
+	if (net->bsc_data)
 		vty_out(vty, "  Last RF Lock Command: %s%s",
 			net->bsc_data->rf_ctrl->last_rf_lock_ctrl_command,
 			VTY_NEWLINE);
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_grace.c b/openbsc/src/osmo-bsc/osmo_bsc_grace.c
index 341971e..4e1c79e 100644
--- a/openbsc/src/osmo-bsc/osmo_bsc_grace.c
+++ b/openbsc/src/osmo-bsc/osmo_bsc_grace.c
@@ -28,8 +28,6 @@
 
 int bsc_grace_allow_new_connection(struct gsm_network *network, struct gsm_bts *bts)
 {
-	if (!network->bsc_data->rf_ctrl)
-		return 1;
 	if (bts->excl_from_rf_lock)
 		return 1;
 	return network->bsc_data->rf_ctrl->policy == S_RF_ON;
@@ -43,8 +41,6 @@
 {
 	struct gsm_bts *bts = NULL;
 
-	if (!subscr->net->bsc_data->rf_ctrl)
-		goto page;
 	if (subscr->net->bsc_data->rf_ctrl->policy == S_RF_ON)
 		goto page;