Index: firmware/App/Drivers/BloodLeakDriver.c
===================================================================
diff -u -r55b07134d116ff3068a6b5d5cae28bce7100adb3 -rd4ff0e628e0cd7866272a8a8a6f26db97286e3b4
--- firmware/App/Drivers/BloodLeakDriver.c	(.../BloodLeakDriver.c)	(revision 55b07134d116ff3068a6b5d5cae28bce7100adb3)
+++ firmware/App/Drivers/BloodLeakDriver.c	(.../BloodLeakDriver.c)	(revision d4ff0e628e0cd7866272a8a8a6f26db97286e3b4)
@@ -7,8 +7,8 @@
 *
 * @file    BloodLeakDriver.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      10-Sep-2024
+* @author  (last)      Jashwant Gantyada
+* @date    (last)      07-Jan-2026
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  10-Sep-2024
@@ -32,7 +32,7 @@
 #include "Utilities.h"
 
 /**
- *  @addtogroup BloodLeak
+ *  @addtogroup BloodLeakDriver
  *  @{
  */
 
@@ -186,14 +186,17 @@
  *************************************************************************/
 void getBloodLeakEmbCmdMode( BLOOD_LEAK_EMB_MODE_CMD_T cmd, EMB_MODE_CMD_T* results )
 {
-    if ((results == NULL) || (cmd >= NUM_OF_EMB_CMDS))
+    if ( cmd < NUM_OF_EMB_CMDS )
     {
-        //Throw an alarm
-        activateAlarmNoData( ALARM_ID_DD_SOFTWARE_FAULT );
-        return;
+        memcpy( results, &bloodLeakEmbModeCmd[cmd], sizeof( EMB_MODE_CMD_T) );
     }
 
-    memcpy( results, &bloodLeakEmbModeCmd[cmd], sizeof( EMB_MODE_CMD_T) );
+    else
+    {
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_BLOOD_LEAK_INVALID_EMB_MODE_CMD_SELECTED, cmd )
+    }
+
+
 }
 /*********************************************************************//**
  * @brief