Index: firmware/App/Drivers/BPDriver.c
===================================================================
diff -u -r04b75259419d70d2870521f1f2ca2e9bea3ad9d1 -r3a4d8c5c7ca884827801433839080bd034209e61
--- firmware/App/Drivers/BPDriver.c	(.../BPDriver.c)	(revision 04b75259419d70d2870521f1f2ca2e9bea3ad9d1)
+++ firmware/App/Drivers/BPDriver.c	(.../BPDriver.c)	(revision 3a4d8c5c7ca884827801433839080bd034209e61)
@@ -180,9 +180,11 @@
 
     if ( BP_MODULE_BUSY_CLEAR == ( getNIBPStatusResponse() & BP_MODULE_BUSY_MASK ) )
     {
-        SEND_EVENT_WITH_2_U32_DATA( TD_EVENT_BUTTON, BP_DRIVER_MEASURE_STATE, 11 )
+        U32 respCode = getBPResponseCode();
+
+        SEND_EVENT_WITH_2_U32_DATA( TD_EVENT_BUTTON, 11, respCode )
         // Verify BP measurement data is available
-        if ( BP_RESP_CODE_BPDATA == getBPResponseCode() )
+        if ( BP_RESP_CODE_BPDATA == respCode )
         {
             SEND_EVENT_WITH_2_U32_DATA( TD_EVENT_BUTTON, BP_DRIVER_MEASURE_STATE, BP_DRIVER_GET_DATA_STATE )
             setNIBPCommand( (U08)BP_CMD_GET_BP_DATA );