Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r164e1a3ffca18c703676bc7f57f5903c76050600 -rfd87688d38be3ed2453ad210728ad95b5dcfd118
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 164e1a3ffca18c703676bc7f57f5903c76050600)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision fd87688d38be3ed2453ad210728ad95b5dcfd118)
@@ -2559,7 +2559,7 @@
     BOOL result = FALSE;
 
     // verify payload length
-    if ( 0 == message->hdr.payloadLen )
+    if ( message->hdr.payloadLen == sizeof( TEST_OVERRIDE_PAYLOAD_T ) )
     {
         memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
         if ( FALSE == payload.reset )