Index: firmware/App/Modes/TreatmentEnd.c
===================================================================
diff -u -rac6532c81f2a6d4ad1c67420c22d59f6aeeaae13 -rcaa09f40b3eea651e4d16c5b057bb336252ae083
--- firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision ac6532c81f2a6d4ad1c67420c22d59f6aeeaae13)
+++ firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision caa09f40b3eea651e4d16c5b057bb336252ae083)
@@ -109,7 +109,8 @@
 {
     initTreatmentEnd();
 
-    // TODO - stop any DG fill that may be in progress
+    // Stop any DG fill that may be in progress
+    cmdStopDGFill();
 
     // Set valves
     setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
@@ -222,6 +223,11 @@
         setupForTxEndPausedState();
         result = TREATMENT_END_PAUSED_STATE;
     }
+    // Is treatment end requested?
+    else if ( TRUE == txEndAlarmEndTreatmentRequested )
+    {
+        signalEndTreatment();
+    }
     // Is final rinseback requested?
     else if ( ( TRUE == txEndRinsebackRequested ) || ( TRUE == txEndAlarmRinsebackRequested ) )
     {
@@ -271,7 +277,8 @@
         // Ensure we do not sit in stopped state for too long
         if ( bloodSittingTimerCtr > MAX_TIME_BLOOD_SITTING )
         {
-            activateAlarmNoData( ALARM_ID_BLOOD_SITTING_TOO_LONG_NO_RINSEBACK );
+            // Raise the alarm
+            activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK );
         }
     }