Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rfacca88de0d4c72d943b59bad9264a9b0a031ae5 -red4d9f0a8493695e63d4b226d1c3d885a00b7565
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision facca88de0d4c72d943b59bad9264a9b0a031ae5)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision ed4d9f0a8493695e63d4b226d1c3d885a00b7565)
@@ -94,7 +94,6 @@
 U32 serializeMessage( MESSAGE_T msg, COMM_BUFFER_T buffer, BOOL ackReq )
 {
     BOOL result = 0;
-    BOOL error = FALSE;
     BOOL blocked = FALSE;
     U32 msgSize = 0;
     U32 sizeMod, sizePad;
@@ -167,17 +166,13 @@
             {
                 if ( FALSE == addMsgToPendingACKList( &msg, buffer, data, msgSize ) )
                 {
-                    error = TRUE;
-                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_MSG_PENDING_ACK_LIST_FULL )
+                    SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_MSG_PENDING_ACK_LIST_FULL, (U32)(msg.hdr.msgID) )
                 }
             }
         }
 
-        if ( FALSE == error )
-        {
-            // Add serialized message data to appropriate out-going comm buffer
-            result = addToCommBuffer( buffer, data, msgSize );
-        }
+        // Add serialized message data to appropriate out-going comm buffer
+        result = addToCommBuffer( buffer, data, msgSize );
     }
     else
     {