Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rd325999b7b3ea03b7e294cb8a0b97df93812fbe9 -r79b494c344417ba6865db01ad5f456e439bec1b2
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision d325999b7b3ea03b7e294cb8a0b97df93812fbe9)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 79b494c344417ba6865db01ad5f456e439bec1b2)
@@ -1101,6 +1101,10 @@
         {
             result = requestDGStop();
         }
+        else if ( ( DG_MODE_STAN == dgMode ) && ( FALSE == startingTreatment.start ) )
+        {
+            result = signalAbortWaterSampling();
+        }
     }
 
     sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, result );
@@ -1860,7 +1864,6 @@
 void sendROPermeateSampleDispenseReadyToHD( void )
 {
     MESSAGE_T msg;
-    U08 *payloadPtr = msg.payload;
 
     // Create a message record
     blankMessage( &msg );