Index: firmware/App/Services/FluidBolus.c
===================================================================
diff -u -r6b9b882169f108f9a5072dc60cdabbc1687aafcc -r83163b27c604072469c28623ba0e4ed9786e294a
--- firmware/App/Services/FluidBolus.c	(.../FluidBolus.c)	(revision 6b9b882169f108f9a5072dc60cdabbc1687aafcc)
+++ firmware/App/Services/FluidBolus.c	(.../FluidBolus.c)	(revision 83163b27c604072469c28623ba0e4ed9786e294a)
@@ -268,7 +268,7 @@
         data.bolFluidVolumeMl = bolusFluidVolumeDelivered_mL;
         data.cumFluidVolumeMl = totalFluidVolumeDelivered_mL;
         data.fluidBolusState  = currentFluidBolusState;
-        data.bolusPermitted   = pubBolusPermitted;
+        data.bolusPermitted   = ( FALSE == isFluidBolusActive() ) ? pubBolusPermitted : FALSE;
 
         broadcastData( MSG_ID_TD_FLUID_BOLUS_DATA, COMM_BUFFER_OUT_CAN_TD_BROADCAST, (U08*)&data, sizeof( FLUID_BOLUS_DATA_PAYLOAD_T ) );
 
@@ -605,7 +605,7 @@
     }
     else
     {
-        //SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_MESSAGE_PAYLOAD_LENGTH, (U32)message->hdr.payloadLen );
+        rejReason = REQUEST_REJECT_REASON_INVALID_REQUEST_FORMAT;
     }
 
     response.accepted        = result;