Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r5e7f27ffe40a1d3bfaf424f294869f16a5c6872d -r2f0638084613eee8d9dcce98d62dce1eaf910f29
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 5e7f27ffe40a1d3bfaf424f294869f16a5c6872d)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 2f0638084613eee8d9dcce98d62dce1eaf910f29)
@@ -1193,7 +1193,7 @@
  *************************************************************************/
 void handleAlarmTriggered( MESSAGE_T *message )
 {
-    if ( message->hdr.payloadLen == ( sizeof( U16 ) + sizeof( U32 ) * 2 * 2 )   // 2 data records w/ 2 U32s each
+    if ( message->hdr.payloadLen == ( sizeof( U16 ) + sizeof( U32 ) * 2 * 2 ) )  // 2 data records w/ 2 U32s each
     {
         U08 *payloadPtr = message->payload;
         U16 alarmID;
@@ -1541,7 +1541,7 @@
 
     // create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_HD_START_TREATMENT_RESPONSE;
+    msg.hdr.msgID = MSG_ID_HD_TREATMENT_END_RESPONSE;
     msg.hdr.payloadLen = sizeof( BOOL );
 
     memcpy( payloadPtr, &accepted, sizeof( BOOL ) );
@@ -1564,21 +1564,18 @@
  *************************************************************************/
 void handleTreatmentParametersFromUI( MESSAGE_T *message )
 {
+    BOOL result = FALSE;
+
     if ( message->hdr.payloadLen == sizeof(TREATMENT_PARAMS_DATA_PAYLOAD_T) )
     {
         TREATMENT_PARAMS_DATA_PAYLOAD_T treatmentParams;
 
         memcpy( &treatmentParams, message->payload, sizeof(TREATMENT_PARAMS_DATA_PAYLOAD_T) );
 
-        if ( FALSE == validateAndSetTreatmentParameters( treatmentParams ) )
-        {
-            sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
-        }
+        result = validateAndSetTreatmentParameters( treatmentParams );
     }
-    else
-    {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
-    }
+
+    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, result );
 }
 
 /*********************************************************************//**