Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r5c083ca7d4ebd1ebd8e745c0fba7148e59894569 -r5b71511ab1de37e47a1cde5d33173144fb9bf25f
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 5c083ca7d4ebd1ebd8e745c0fba7148e59894569)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 5b71511ab1de37e47a1cde5d33173144fb9bf25f)
@@ -1054,7 +1054,7 @@
     payloadPtr += sizeof( U32 );
     memcpy( payloadPtr, &reason, sizeof( U32 ) );
     payloadPtr += sizeof( U32 );
-    memcpy( payloadPtr, alarmList, sizeof( U32 ) );
+    memcpy( payloadPtr, alarmList, size );
 
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
     return serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_REQUIRED );
@@ -8012,7 +8012,7 @@
     BOOL result = FALSE;
 
     // Verify payload length
-    if ( 0 == message->hdr.payloadLen )
+    if ( ( 0 == message->hdr.payloadLen ) && ( TRUE == isTestingActivated() ) )
     {
         signalDialInPumpHardStop();
     }
@@ -8035,7 +8035,7 @@
     BOOL result = FALSE;
 
     // Verify payload length
-    if ( 0 == message->hdr.payloadLen )
+    if ( ( 0 == message->hdr.payloadLen ) && ( TRUE == isTestingActivated() ) )
     {
         signalDialOutPumpHardStop();
     }
@@ -8058,7 +8058,7 @@
     BOOL result = FALSE;
 
     // Verify payload length
-    if ( 0 == message->hdr.payloadLen )
+    if ( ( 0 == message->hdr.payloadLen ) && ( TRUE == isTestingActivated() ) )
     {
         signalBloodPumpHardStop();
     }