Index: firmware/App/HDCommon.h
===================================================================
diff -u -rcfffd58901fe6e82c6a74bd752c94b866ed0d3e7 -rd4e699aba5ad4e197ef97cba4bc6ebebf210d1b3
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision cfffd58901fe6e82c6a74bd752c94b866ed0d3e7)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision d4e699aba5ad4e197ef97cba4bc6ebebf210d1b3)
@@ -25,7 +25,7 @@
 #define HD_VERSION_MAJOR        0
 #define HD_VERSION_MINOR        5
 #define HD_VERSION_MICRO        0
-#define HD_VERSION_BUILD        9013
+#define HD_VERSION_BUILD        9016
 
 // ********** development build switches **********
 
Index: firmware/App/Modes/ModeTreatmentParams.c
===================================================================
diff -u -rea0047d0cb48b899475cf519e7e4997d96f5e538 -rd4e699aba5ad4e197ef97cba4bc6ebebf210d1b3
--- firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision ea0047d0cb48b899475cf519e7e4997d96f5e538)
+++ firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision d4e699aba5ad4e197ef97cba4bc6ebebf210d1b3)
@@ -504,13 +504,15 @@
     // Range check treatment parameters up to (but not including) UF volume
     for ( param = TREATMENT_PARAM_FIRST_UINT; param < TREATMENT_PARAM_UF_VOLUME; param++ )
     {
-        BOOL isParamInRange = isTreatmentParamInRange( param, stagedParams[ param ] );
-
-        reasons[ param ] = ( TRUE == isParamInRange ? REQUEST_REJECT_REASON_NONE : REQUEST_REJECT_REASON_PARAM_OUT_OF_RANGE );
-        if ( FALSE == isParamInRange )
+        if ( FALSE == isTreatmentParamInRange( param, stagedParams[ param ] ) )
         {
+            reasons[ param ] = REQUEST_REJECT_REASON_PARAM_OUT_OF_RANGE;
             result = FALSE;
         }
+        else
+        {
+            reasons[ param ] = REQUEST_REJECT_REASON_NONE;
+        }
     }
 
     return result;
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r6d05f4b1484a9271d8cf3b529dbb7e5080e7c954 -rd4e699aba5ad4e197ef97cba4bc6ebebf210d1b3
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 6d05f4b1484a9271d8cf3b529dbb7e5080e7c954)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision d4e699aba5ad4e197ef97cba4bc6ebebf210d1b3)
@@ -1529,7 +1529,7 @@
                 handleSetFluidLeakBroadcastIntervalOverrideRequest( message );
                 break;
 
-            case MSG_ID_HD_FLUID_LEAK_STATE_DETECTOR_OVERRIDE:
+            case MSG_ID_HD_BLOOD_LEAK_STATUS_OVERRIDE:
                 handleSetFluidLeakStateDetectorOverrideRequest( message );
 
             case MSG_ID_HD_SET_OP_MODE_REQUEST: