Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -rd325999b7b3ea03b7e294cb8a0b97df93812fbe9 -r728c213b3958b98a416772d3857f08e390fd04fe
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision d325999b7b3ea03b7e294cb8a0b97df93812fbe9)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 728c213b3958b98a416772d3857f08e390fd04fe)
@@ -20,8 +20,9 @@
 #include "CPLD.h"
 #include "DrainPump.h"
 #include "Heaters.h"
-#include "ModeFill.h"
 #include "ModeDrain.h"
+#include "ModeFill.h"
+#include "ModeGenIdle.h"
 #include "OperationModes.h"
 #include "Pressures.h"
 #include "Reservoirs.h"
@@ -301,14 +302,18 @@
             {
                 resetChemicalUsedVolumeML( ACID );
                 setThisFisrtFillFlag( TRUE );                                 // indicates bottles need prime
+                setEmptyBottleDetectedFlag( TRUE );
                 activateAlarmNoData( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME );
+                activateAlarmNoData ( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT );
             }
 
             if ( ( bicarbBottleVolML - getChemicalUsedVolumeML( BICARB ) ) <= CONCENTRATE_BOTTLE_BICARB_LOW_VOLUME_ML )  // SRSDG 837
             {
                 resetChemicalUsedVolumeML( BICARB );
                 setThisFisrtFillFlag( TRUE );
+                setEmptyBottleDetectedFlag( TRUE );
                 activateAlarmNoData( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME );
+                activateAlarmNoData ( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT );
             }
         }