Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rbae4aed1e77e9d1bfbc7e894e5331542460f6af7 -rb66a46b01b241f67550e191553e0fcdc77f4d2f7
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision bae4aed1e77e9d1bfbc7e894e5331542460f6af7)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision b66a46b01b241f67550e191553e0fcdc77f4d2f7)
@@ -1100,6 +1100,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 );
@@ -1859,7 +1863,6 @@
 void sendROPermeateSampleDispenseReadyToHD( void )
 {
     MESSAGE_T msg;
-    U08 *payloadPtr = msg.payload;
 
     // Create a message record
     blankMessage( &msg );