Index: firmware/App/Services/NVMessagingDD.c
===================================================================
diff -u -rbe1ff666dbd2ff03342c22c8e50b21d0f9b988a9 -r1ce98afa73e6c88addb3a01643c791c15e7a147c
--- firmware/App/Services/NVMessagingDD.c	(.../NVMessagingDD.c)	(revision be1ff666dbd2ff03342c22c8e50b21d0f9b988a9)
+++ firmware/App/Services/NVMessagingDD.c	(.../NVMessagingDD.c)	(revision 1ce98afa73e6c88addb3a01643c791c15e7a147c)
@@ -178,8 +178,8 @@
     isPublishRecordRequested[ NVM_INSTITUTIONAL_RECORD ] = FALSE;
     isPublishRecordRequested[ NVM_USAGE_INFO_RECORD ]    = FALSE;
     recordSendDataIntervalCounter                        = 0;
-    sendInstitRec                                        = DD_INSTIT_MIN_DIALYSATE_FLOW_MLPM;
-    sendCalRec                                           = DD_CAL_RECORD_PRESSURE_SENSOR;
+    sendInstitRec                                        = DD_INSTIT_FIRST_PARAM;
+    sendCalRec                                           = DD_CAL_FIRST_RECORD;
 }
 
 /*********************************************************************//**
@@ -325,6 +325,7 @@
  * The handleExecSendRecordSendState function handles the send state of
  * the exec send record state machine. It sends record data in chunks
  * based on timing and message count.
+ * @details \b Alarms: ALARM_ID_DD_SOFTWARE_FAULT if invalid record type
  * @details \b Inputs: recordPublishTotalMsgs,
  * recordPublishMsgCount, recordSendDataIntervalCounter,
  * recordToPublish
@@ -339,7 +340,7 @@
     // If it is time to send data
     if ( ++recordSendDataIntervalCounter >= RECORD_DATA_SEND_INTERVAL_COUNT )
     {
-        switch(recordToPublish)
+        switch( recordToPublish )
         {
             case NVM_SYSTEM_RECORD:
                 state = handleSendDDSystemRecord();
@@ -362,6 +363,9 @@
                 break;
 
             default:
+                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, ( U32 )recordToPublish );
+                recordToPublish = NVM_SYSTEM_RECORD;
+                state = NVM_SEND_RECORD_STATE_IDLE;
                 break;
         }