Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r0803f828b81e046166457564650acf6a9bbd3cc6 -r9df576f7d1962f640d8d8a4b56403431c67a8639
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 0803f828b81e046166457564650acf6a9bbd3cc6)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 9df576f7d1962f640d8d8a4b56403431c67a8639)
@@ -330,10 +330,8 @@
 {
     DG_HEATERS_RECORD_T heaterInfo;
 
-    // There is no number of NV data to check for the heaters info so it is passed as 0
-    U08 numOfNVData2Check = 0;
     // Get the heaters info from the NV data management. Do not alarm on the status of the data since it has already been checked in NV POST
-    getNVRecord2Driver( GET_INF_HEATERS_RECORD, (U08*)&heaterInfo, sizeof( DG_HEATERS_RECORD_T ), numOfNVData2Check, ALARM_ID_NO_ALARM );
+    getNVRecord2Driver( GET_INF_HEATERS_RECORD, (U08*)&heaterInfo, sizeof( DG_HEATERS_RECORD_T ), 0, ALARM_ID_NO_ALARM );
 
     // If the data in the NV data management was not initialized properly, set it to 0 otherwise, set the average flow rate
     fillStatus.fillFlowRateAverage       = ( heaterInfo.averageFillFlow < NEARLY_ZERO ? 0.0 : heaterInfo.averageFillFlow );
@@ -381,6 +379,10 @@
     {
         volume = getF32OverrideValue( &usedBicarbVolumeML );
     }
+    else
+    {
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_CHEMICAL_BOTTLE_SELECTED, bottle )
+    }
 
     return volume;
 }
@@ -404,6 +406,10 @@
     {
         usedBicarbVolumeML.data = 0.0;
     }
+    else
+    {
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_CHEMICAL_BOTTLE_SELECTED, bottle )
+    }
 }
 
 /*********************************************************************//**