diff --git a/src/capwap/cwmsg_init.c b/src/capwap/cwmsg_init.c
index 69207ded..c8df7d2c 100644
--- a/src/capwap/cwmsg_init.c
+++ b/src/capwap/cwmsg_init.c
@@ -53,7 +53,10 @@ void cwmsg_init(struct cwmsg * cwmsg, uint8_t *buffer, int type, int seqnum, str
 
 	cwmsg->pos=0;
 	cwmsg->hlen=hlen/4;
-	cwmsg->rid=radioinfo->rid;
+	if (radioinfo)
+		cwmsg->rid=radioinfo->rid;
+	else	
+		cwmsg->rid=0;
 	cwmsg->seqnum=seqnum;
 	cwmsg->type=type;
 }