diff --git a/src/cw/cw_put_msg.c b/src/cw/cw_put_msg.c
index 62e603c7..72b80edb 100644
--- a/src/cw/cw_put_msg.c
+++ b/src/cw/cw_put_msg.c
@@ -86,10 +86,10 @@ int cw_put_msg(struct conn *conn, uint8_t * rawout)
 		params.elem=NULL;
 		
 		l = handler->put(handler,&params,dst+len);
-		len += l;
-		
+				
 		if(l>0)
 			cw_dbg_elem(DBG_ELEM_OUT,conn,type,handler,&params,dst+len,l);
+		len += l;
 	}
 
 	cw_set_msg_elems_len(msgptr, len);
diff --git a/src/mod/capwap/capwap_out_wtp_board_data.c b/src/mod/capwap/capwap_out_wtp_board_data.c
index bdf8723c..bc18c6f3 100644
--- a/src/mod/capwap/capwap_out_wtp_board_data.c
+++ b/src/mod/capwap/capwap_out_wtp_board_data.c
@@ -21,7 +21,7 @@ static int write_boarddata_subelem(uint8_t * dst, mavl_t ktv, const char * paren
 	
 	if (val == NULL) {
 		cw_log(LOG_ERR,
-		       "Error: Can't set sub-element %d from key %s in WTP Board Data. Key not found",type,key);
+		       "Creating WTP Board Data sub-element %d. Key not '%s' found",type,key);
 		return 0;
 	}
 
@@ -54,7 +54,7 @@ int capwap_out_wtp_board_data(struct cw_ElemHandler * eh,
 	
 	if (val ==NULL) {
 		cw_log(LOG_ERR,
-		       "Error: Can't send WTP Board Data element - %s not defined.", key);
+		       "Creating WTP Board Data element. Key '%s' not found.", key);
 		return 0;
 	}