Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r94c4f859bf5a6844089972b41fb60a8d6ebd0463 -r0b36ae4b591ce21b1971e00a5c2102d68f68d0a6
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 94c4f859bf5a6844089972b41fb60a8d6ebd0463)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 0b36ae4b591ce21b1971e00a5c2102d68f68d0a6)
@@ -996,6 +996,7 @@
 void cmdStartDGFlush( void )
 {
     BOOL start = TRUE;
+
     dgCmdResp[ DG_CMD_START_FLUSH ].commandID = DG_CMD_NONE;
 
     sendDGStartFlushModeCommand( start );
@@ -1012,6 +1013,7 @@
 void cmdStopDGFlush( void )
 {
     BOOL start = FALSE;
+
     dgCmdResp[ DG_CMD_STOP_FLUSH ].commandID = DG_CMD_NONE;
 
     sendDGStartFlushModeCommand( start );
@@ -1028,6 +1030,7 @@
 void cmdStartDGHeatDisinfect( void )
 {
     BOOL start = TRUE;
+
     dgCmdResp[ DG_CMD_START_HEAT_DISINFECT ].commandID = DG_CMD_NONE;
 
     sendDGStartHeatDisinfectModeCommand( start );
@@ -1044,6 +1047,7 @@
 void cmdStopDGHeatDisinfect( void )
 {
     BOOL start = FALSE;
+
     dgCmdResp[ DG_CMD_STOP_HEAT_DISINFECT ].commandID = DG_CMD_NONE;
 
     sendDGStartHeatDisinfectModeCommand( start );
@@ -1060,6 +1064,7 @@
 void cmdStartDGChemicalDisinfect( void )
 {
     BOOL start = TRUE;
+
     dgCmdResp[ DG_CMD_START_CHEM_DISINFECT ].commandID = DG_CMD_NONE;
     sendDGStartChemicalDisinfectModeCommand( start );
 }
@@ -1075,6 +1080,7 @@
 void cmdStopDGChemicalDisinfect( void )
 {
     BOOL start = FALSE;
+
     dgCmdResp[ DG_CMD_STOP_CHEM_DISINFECT ].commandID = DG_CMD_NONE;
     sendDGStartChemicalDisinfectModeCommand( start );
 }
@@ -1090,6 +1096,7 @@
 void cmdStartDGChemicalFlushDisinfect( void )
 {
     BOOL start = TRUE;
+
     dgCmdResp[ DG_CMD_START_CHEM_DISINFECT_FLUSH ].commandID = DG_CMD_NONE;
     sendDGStartStopChemicalDisinfectFlushModeCommand( start );
 }
@@ -1105,6 +1112,7 @@
 void cmdStopDGChemFlushDisinfect( void )
 {
     BOOL start = FALSE;
+
     dgCmdResp[ DG_CMD_STOP_CHEM_DISINFECT_FLUSH ].commandID = DG_CMD_NONE;
     sendDGStartStopChemicalDisinfectFlushModeCommand( start );
 }
Index: firmware/App/Modes/Rinseback.c
===================================================================
diff -u -r3fa496b611a3a84c8aaa882a1b27762c6bc0024c -r0b36ae4b591ce21b1971e00a5c2102d68f68d0a6
--- firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 3fa496b611a3a84c8aaa882a1b27762c6bc0024c)
+++ firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 0b36ae4b591ce21b1971e00a5c2102d68f68d0a6)
@@ -416,7 +416,7 @@
         result = RINSEBACK_STOP_STATE;
     }
     // Check for empty saline bag
-    if ( TRUE == isSalineBagEmpty() )
+    else if ( TRUE == isSalineBagEmpty() )
     {
         SET_ALARM_WITH_1_F32_DATA( ALARM_ID_HD_EMPTY_SALINE_BAG, getMeasuredArterialPressure() );
         setupForRinsebackStopOrPause();