Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r8e72c6f49edd66b0eadf56e4d7aeafea58763a3f -r812feca72b3d234237475fcd5eb979e2a28dab3b
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 8e72c6f49edd66b0eadf56e4d7aeafea58763a3f)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 812feca72b3d234237475fcd5eb979e2a28dab3b)
@@ -1669,6 +1669,7 @@
         U32 epoch;
 
         memcpy( &epoch,  message->payload, sizeof( U32 ) );
+        isEpochValid ( epoch );
         result = setRTCEpoch( epoch );
         if ( FALSE == result )
         {
@@ -5529,6 +5530,7 @@
     if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+
         if ( FALSE == payload.reset )
         {
             result = testSetBatteryRemainingCapacityOverride( payload.state.f32 );