Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rf9a866abfc44db38c01cb795fea894cce1042eec -r742d2fb15db80b1458b64704d499a790b0cf7989
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision f9a866abfc44db38c01cb795fea894cce1042eec)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 742d2fb15db80b1458b64704d499a790b0cf7989)
@@ -3088,6 +3088,11 @@
     HD_VERSIONS_T payload;
     U08 *payloadPtr = msg.payload;
 
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_VERSION;
+    msg.hdr.payloadLen = sizeof( HD_VERSIONS_T );
+
     if ( message->hdr.payloadLen == sizeof( UI_VERSIONS_T ) )
     {
         // Get UI version data from this request msg and have it recorded
@@ -3101,11 +3106,6 @@
         payload.compatibilityRev = (U32)SW_COMPATIBILITY_REV;
         getFPGAVersions( &payload.fpgaId, &payload.fpgaMajor, &payload.fpgaMinor, &payload.fpgaLab );
 
-        // Create a message record
-        blankMessage( &msg );
-        msg.hdr.msgID = MSG_ID_HD_VERSION;
-        msg.hdr.payloadLen = sizeof( HD_VERSIONS_T );
-
         // Fill message payload
         memcpy( payloadPtr, &payload, sizeof( HD_VERSIONS_T ) );
     }
@@ -3211,13 +3211,13 @@
     getNVRecord2Driver( GET_SRV_RECORD, (U08*)&service, sizeof( HD_SERVICE_RECORD_T ), 0, ALARM_ID_NO_ALARM );
     getHDVersionDGServiceAndUsageData( &dgData );
 
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID      = MSG_ID_HD_SERVICE_SCHEDULE_DATA;
+    msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 );
+
     if ( 0 == message->hdr.payloadLen )
     {
-        // Create a message record
-        blankMessage( &msg );
-        msg.hdr.msgID      = MSG_ID_HD_SERVICE_SCHEDULE_DATA;
-        msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 );
-
         // Fill message payload
         memcpy( payloadPtr, &service.lastServiceEpochDate, sizeof( U32 ) );
         payloadPtr += sizeof( U32 );