Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r3321a6fc6f08b731cfe3dafaa618f93b32acaf45 -r766e65a173747dd60a9faae1cac228cd5f8a55a6
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 3321a6fc6f08b731cfe3dafaa618f93b32acaf45)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 766e65a173747dd60a9faae1cac228cd5f8a55a6)
@@ -262,10 +262,10 @@
  * @brief
  * The getMsgHandler function finds the appropriate handler function
  * for the given message.
- * @details Inputs: MSG_FUNCTION_HANDLER_LOOKUP[],
- * @details Outputs: Appropriate message handler function called
- * @param message Incoming message to handle
- * @return none
+ * @details Inputs: MSG_FUNCTION_HANDLER_LOOKUP[], MSG_FUNCTION_HANDLERS[]
+ * @details Outputs: none
+ * @param msgID ID of message to find handler function for
+ * @return pointer to appropriate function to handle given message
  *************************************************************************/
 static MsgFuncPtr getMsgHandler( U16 msgID )
 {
@@ -288,7 +288,7 @@
  * @brief
  * The handleIncomingMessage function calls the appropriate handler function
  * for the given message.
- * @details Inputs:
+ * @details Inputs: none
  * @details Outputs: Appropriate message handler function called
  * @param message Incoming message to handle
  * @return none
@@ -315,7 +315,10 @@
     // ACK/NAK request
     if ( message->hdr.msgID < MSG_ID_FIRST_TD_TESTER_MESSAGE )
     {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, respBuffer, ack );
+        if ( respBuffer != COMM_BUFFER_NOT_USED )
+        {
+            sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, respBuffer, ack );
+        }
     }
     else
     {