Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -r6c1d6a3eaf065c2b2d537d9fef793d73ea328359 -rfc3e2b171a80665f9359c423f9a6f997b92c1aca
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 6c1d6a3eaf065c2b2d537d9fef793d73ea328359)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision fc3e2b171a80665f9359c423f9a6f997b92c1aca)
@@ -428,7 +428,7 @@
 /*********************************************************************//**
  * @brief
  * The handlePostTreatmentVerifyState function verifies cartridge removed,
- * syringe removed, and doors are closed before transition to standby mode.
+ * syringe removed before transition to standby mode.
  * @details Inputs: doors' status, syringe status, occlusion sensors value
  * @details Outputs: requested transition to standby mode
  * @return current state (sub-mode)
@@ -446,27 +446,20 @@
         isCartridgeRemoved = isCartridgeUnloaded();
     }
 
-    if ( STATE_CLOSED == getSwitchStatus( FRONT_DOOR ) )
+    if ( FALSE == isCartridgeRemoved )
     {
-        if ( FALSE == isCartridgeRemoved )
-        {
-            activateAlarmNoData( ALARM_ID_CARTRIDGE_REMOVAL_FAILURE );
-        }
+        activateAlarmNoData( ALARM_ID_CARTRIDGE_REMOVAL_FAILURE );
+    }
 
-        if ( TRUE == isSyringeDetected() )
-        {
-            activateAlarmNoData( ALARM_ID_HD_SYRINGE_DETECTED );
-        }
-        // Wait for cartridge and syringe to be removed and for DG to finish any drains/fills.
-        if ( ( TRUE == isCartridgeRemoved ) && ( FALSE == isSyringeDetected() ) )
-        {
-            cmdStopDG();
-            requestNewOperationMode( MODE_STAN );
-        }
+    if ( TRUE == isSyringeDetected() )
+    {
+        activateAlarmNoData( ALARM_ID_HD_SYRINGE_DETECTED );
     }
-    else
+    // Wait for cartridge and syringe to be removed and for DG to finish any drains/fills.
+    if ( ( TRUE == isCartridgeRemoved ) && ( FALSE == isSyringeDetected() ) )
     {
-        activateAlarmNoData( ALARM_ID_CARTRIDGE_DOOR_OPENED );
+        cmdStopDG();
+        requestNewOperationMode( MODE_STAN );
     }
 
     return HD_POST_TREATMENT_VERIFY_STATE;