--- libaitmqtt/src/conn.c	2012/06/20 08:55:50	1.1.1.1.2.3
+++ libaitmqtt/src/conn.c	2012/06/20 08:57:48	1.1.1.1.2.4
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: conn.c,v 1.1.1.1.2.3 2012/06/20 08:55:50 misho Exp $
+* $Id: conn.c,v 1.1.1.1.2.4 2012/06/20 08:57:48 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -106,7 +106,7 @@ mqtt_msgCONNECT(mqtt_msg_t * __restrict buf, const cha
 	}
 	if (csWillTopic && *csWillTopic) {		/* will messages */
 		len += sizeof(mqtt_len_t) + strlen(csWillTopic);
-		len += sizeof(mqtt_len_t) + strlen(csWillMessage);
+		len += sizeof(mqtt_len_t) + csWillMessage ? strlen(csWillMessage) : 0;
 	}
 
 	/* calculate header size */