Index: NVDataMgmt.c
===================================================================
diff -u -r4a839ae2509ee0847a5b2eafc313c90e7cbbc44c -r10a4b77aae9fe7dddcdae980c40e3a6d8a47e50c
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 4a839ae2509ee0847a5b2eafc313c90e7cbbc44c)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 10a4b77aae9fe7dddcdae980c40e3a6d8a47e50c)
@@ -828,8 +828,8 @@
             readFromRAM( BOOTLOADER_FLAG_ADDRESS, BOOTLOADER_FLAG_LENGTH_BYTES );
             // Get the time to check for timeout
             currentTime = getMSTimerCount();
+            state = NVDATAMGMT_SELF_TEST_STATE_READ_BOOTLOADER_FLAG;
         }
-        state = NVDATAMGMT_SELF_TEST_STATE_READ_BOOTLOADER_FLAG;
     }
 
     return state;
@@ -861,15 +861,15 @@
         {
             readFromRAM ( HD_TREATMENT_TIME_ADDRESS, sizeof(TREATMENT_TIME_RECORD_T) );
             currentTime = getMSTimerCount();
+            state = NVDATAMGMT_SELF_TEST_STATE_READ_TREATMENT_TIME;
         }
-        state = NVDATAMGMT_SELF_TEST_STATE_READ_TREATMENT_TIME;
 #else
         if ( getRTCRAMState() == RTC_RAM_STATE_READY )
         {
             readFromRAM ( DG_CONSUMED_WATER_ADDRESS, sizeof(WATER_CONSUMPTION_RECORD_T) );
             currentTime = getMSTimerCount();
+            state = NVDATAMGMT_SELF_TEST_STATE_READ_WATER_CONSUMPTION;
         }
-        state = NVDATAMGMT_SELF_TEST_STATE_READ_WATER_CONSUMPTION;
 #endif
     }
 
@@ -930,8 +930,8 @@
         {
             readFromRAM ( LOG_RECORD_START_ADDRESS, sizeof(LOG_RECORD_T) );
             currentTime = getMSTimerCount();
+            state = NVDATAMGMT_SELF_TEST_STATE_READ_LOG_RECORD;
         }
-        state = NVDATAMGMT_SELF_TEST_STATE_READ_LOG_RECORD;
     }
 
     return state;
@@ -1046,8 +1046,8 @@
         {
             currentTime = getMSTimerCount();
             readFromRAM( LAST_DISINFECTION_DATE_ADDRESS, sizeof(LAST_DISINFECTION_RECORD_T) );
+            state = NVDATAMGMT_SELF_TEST_STATE_READ_LAST_DISINFECTION_DATE;
         }
-        state = NVDATAMGMT_SELF_TEST_STATE_READ_LAST_DISINFECTION_DATE;
     }
 
     return state;
@@ -1287,8 +1287,9 @@
             {
                 currentTime = getMSTimerCount();
                 writeToRAM ( (U32)startAddress, currentJob.buffer, length );
+                state = NVDATAMGMT_EXEC_STATE_WRITE_TO_RTC;
             }
-            state = NVDATAMGMT_EXEC_STATE_WRITE_TO_RTC;
+
         }
         else if ( ops == NVDATAMGMT_READ && location == NVDATAMGMT_RTC )
         {
@@ -1297,8 +1298,8 @@
                 currentTime = getMSTimerCount();
                 readFromRAM( (U32)startAddress, length );
                 currentJob.externalAddress->status = NVDATAMGMT_READ_IN_PROGRESS;
+                state = NVDATAMGMT_EXEC_STATE_READ_FROM_RTC;
             }
-            state = NVDATAMGMT_EXEC_STATE_READ_FROM_RTC;
         }
     }