Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -rb1492eff71eab83d55456ad3520ccfd6cda06a77 -r1efa1af5337b36f5022df5ce8cb7459352f13a8b
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision b1492eff71eab83d55456ad3520ccfd6cda06a77)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 1efa1af5337b36f5022df5ce8cb7459352f13a8b)
@@ -1104,49 +1104,52 @@
 {
     F32 dopCurr;
 
-    // DialOut pump should be off
-    if ( DIAL_OUT_PUMP_OFF_STATE == dialOutPumpState )
+    if ( FALSE == isAlarmActive( ALARM_ID_HD_AC_POWER_LOST ) )
     {
-        dopCurr = fabs( getMeasuredDialOutPumpMCCurrent() );
-        if ( dopCurr > DOP_MAX_CURR_WHEN_STOPPED_MA )
+        // DialOut pump should be off
+        if ( DIAL_OUT_PUMP_OFF_STATE == dialOutPumpState )
         {
-            dopCurrErrorDurationCtr += TASK_PRIORITY_INTERVAL;
-            if ( dopCurrErrorDurationCtr > DOP_MAX_CURR_ERROR_DURATION_MS )
+            dopCurr = fabs( getMeasuredDialOutPumpMCCurrent() );
+            if ( dopCurr > DOP_MAX_CURR_WHEN_STOPPED_MA )
             {
-#ifndef _RELEASE_
-                if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_MOTOR_CURRNT_CHECKS ) != SW_CONFIG_ENABLE_VALUE )
-#endif
+                dopCurrErrorDurationCtr += TASK_PRIORITY_INTERVAL;
+                if ( dopCurrErrorDurationCtr > DOP_MAX_CURR_ERROR_DURATION_MS )
                 {
-                    SET_ALARM_WITH_1_F32_DATA( ALARM_ID_DIAL_OUT_PUMP_MC_CURRENT_CHECK, getMeasuredDialOutPumpMCCurrent() );
+    #ifndef _RELEASE_
+                    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_MOTOR_CURRNT_CHECKS ) != SW_CONFIG_ENABLE_VALUE )
+    #endif
+                    {
+                        SET_ALARM_WITH_1_F32_DATA( ALARM_ID_DIAL_OUT_PUMP_MC_CURRENT_CHECK, getMeasuredDialOutPumpMCCurrent() );
+                    }
                 }
             }
+            else
+            {
+                dopCurrErrorDurationCtr = 0;
+            }
         }
+        // DialOut pump should be running
         else
         {
-            dopCurrErrorDurationCtr = 0;
-        }
-    }
-    // DialOut pump should be running
-    else
-    {
-        dopCurr = fabs( getMeasuredDialOutPumpMCCurrent() );
-        if ( dopCurr > DOP_MAX_CURR_WHEN_RUNNING_MA )
-        {
-            dopCurrErrorDurationCtr += TASK_PRIORITY_INTERVAL;
-            if ( dopCurrErrorDurationCtr > DOP_MAX_CURR_ERROR_DURATION_MS )
+            dopCurr = fabs( getMeasuredDialOutPumpMCCurrent() );
+            if ( dopCurr > DOP_MAX_CURR_WHEN_RUNNING_MA )
             {
-#ifndef _RELEASE_
-                if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_MOTOR_CURRNT_CHECKS ) != SW_CONFIG_ENABLE_VALUE )
-#endif
+                dopCurrErrorDurationCtr += TASK_PRIORITY_INTERVAL;
+                if ( dopCurrErrorDurationCtr > DOP_MAX_CURR_ERROR_DURATION_MS )
                 {
-                    SET_ALARM_WITH_1_F32_DATA( ALARM_ID_DIAL_OUT_PUMP_MC_CURRENT_CHECK, getMeasuredDialOutPumpMCCurrent() );
+    #ifndef _RELEASE_
+                    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_MOTOR_CURRNT_CHECKS ) != SW_CONFIG_ENABLE_VALUE )
+    #endif
+                    {
+                        SET_ALARM_WITH_1_F32_DATA( ALARM_ID_DIAL_OUT_PUMP_MC_CURRENT_CHECK, getMeasuredDialOutPumpMCCurrent() );
+                    }
                 }
             }
+            else
+            {
+                dopCurrErrorDurationCtr = 0;
+            }
         }
-        else
-        {
-            dopCurrErrorDurationCtr = 0;
-        }
     }
 }