Index: NVDataMgmt.c
===================================================================
diff -u -r0b3fcb5f114e39918a3d2d646a10d4ea24b20b47 -rd77658a58b5a98e10775c256a42ef21d3a297885
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 0b3fcb5f114e39918a3d2d646a10d4ea24b20b47)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision d77658a58b5a98e10775c256a42ef21d3a297885)
@@ -4010,7 +4010,6 @@
     U32 tempIndex;
     PROCESS_RECORD_JOB_T tempJob;
     BOOL status        = FALSE;
-    BOOL checkUIStatus = TRUE;
 
     // Initialize the structure per CppCheck run
     tempJob.memoryLocation  = NVDATAMGMT_EEPROM;
@@ -4026,22 +4025,28 @@
     }
     _enable_IRQ();
 
+    if ( NVDATAMGMT_RTC == tempJob.memoryLocation )
+    {
 #ifdef _HD_
-    checkUIStatus = ( TRUE == uiCommunicated() ? TRUE : FALSE );
+        if ( TRUE == uiCommunicated() )
 #endif
-
-    if ( ( NVDATAMGMT_RTC == tempJob.memoryLocation ) && ( TRUE == checkUIStatus ) )
-    {
-        if ( ( RTC_RAM_STATE_READY == getRTCRAMState() ) && ( TRUE == getSemaphore( SEMAPHORE_RTC ) ) )
         {
-            status = TRUE;
+            if ( ( RTC_RAM_STATE_READY == getRTCRAMState() ) && ( TRUE == getSemaphore( SEMAPHORE_RTC ) ) )
+            {
+                status = TRUE;
+            }
         }
     }
-    else if ( ( NVDATAMGMT_EEPROM == tempJob.memoryLocation ) && ( TRUE == checkUIStatus ) )
+    else if ( NVDATAMGMT_EEPROM == tempJob.memoryLocation )
     {
-        if ( Fapi_Status_FsmReady == FAPI_CHECK_FSM_READY_BUSY )
+#ifdef _HD_
+        if ( TRUE == uiCommunicated() )
+#endif
         {
-            status = TRUE;
+            if ( Fapi_Status_FsmReady == FAPI_CHECK_FSM_READY_BUSY )
+            {
+                status = TRUE;
+            }
         }
     }