diff --git a/actube.workspace b/actube.workspace
index 361145ca..e0162c79 100644
--- a/actube.workspace
+++ b/actube.workspace
@@ -5,8 +5,8 @@
   <Project Name="mod_cipwap" Path="mod_cipwap.project" Active="No"/>
   <Project Name="mod_capwap" Path="mod_capwap.project" Active="No"/>
   <Project Name="mod_cisco" Path="mod_cisco.project" Active="No"/>
-  <Project Name="libcw" Path="libcw.project" Active="No"/>
-  <Project Name="mod_capwap80211" Path="mod_capwap80211.project" Active="Yes"/>
+  <Project Name="libcw" Path="libcw.project" Active="Yes"/>
+  <Project Name="mod_capwap80211" Path="mod_capwap80211.project" Active="No"/>
   <Project Name="mod_fortinet" Path="mod_fortinet.project" Active="No"/>
   <BuildMatrix>
     <WorkspaceConfiguration Name="Debug" Selected="yes">
diff --git a/src/cw/cw_put_msg.c b/src/cw/cw_put_msg.c
index 55ede4c6..d50c6582 100644
--- a/src/cw/cw_put_msg.c
+++ b/src/cw/cw_put_msg.c
@@ -75,6 +75,12 @@ int cw_put_msg(struct conn *conn, uint8_t * rawout)
 		data =  mlistelem_dataptr(elem);
 		handler = cw_msgset_get_elemhandler(conn->msgset,data->proto,data->vendor,data->id);
 	/*	printf("Elem: %d %d %d %s\n", data->proto, data->vendor, data->id, handler->name);*/
+		if (handler==NULL){
+			cw_log(LOG_ERR,"Can't put message element %d %d %, no handler defined.",
+					data->proto,data->vendor,data->id);
+			continue;
+		}
+
 
 		if (handler->put == NULL){
 			if (data->mand){
diff --git a/src/wtp/config.ktv b/src/wtp/config.ktv
index 5e531b9b..972be761 100644
--- a/src/wtp/config.ktv
+++ b/src/wtp/config.ktv
@@ -27,7 +27,6 @@ wtp-descriptor/bootloader/version:Bstr16:.x171312
 wtp-descriptor/max-radios:Byte:2
 
 radio/0/wtp-radio-information:Dword:01
-radio/1/wtp-radio-information:Dword:15
-radio/2/wtp-radio-information:Dword:03
+radio/1/wtp-radio-information:Dword:02
 
 wtp-name:Bstr16:WFAT01