Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r80fe66af8d14c4fa7c2ddfb0d4f14d3f11989812 -rbe587eebf8193ff2a1864b7da9012ca410588ce1
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 80fe66af8d14c4fa7c2ddfb0d4f14d3f11989812)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision be587eebf8193ff2a1864b7da9012ca410588ce1)
@@ -355,13 +355,13 @@
     {
         alarmsBlockedTimer = ALARM_BLOCKED_COUNT_AFTER_AC_RETURN;
     }
-    // if the block timer is 0 OR we have an unblockable alarm
-    if (   ( ALARM_NOT_BLOCKED == alarmsBlockedTimer )
-            || ( ALARM_ID_HD_AC_POWER_LOST == alarm )
-            || ( ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT == alarm ) )
+    // Sanity check, verify valid alarm index
+    if ( ( alarm > ALARM_ID_NO_ALARM ) && ( alarm < NUM_OF_ALARM_IDS ) )
     {
-        // Sanity check, verify valid alarm index
-        if ( ( alarm > ALARM_ID_NO_ALARM ) && ( alarm < NUM_OF_ALARM_IDS ) )
+        // if the block timer is 0 OR we have an unblockable alarm
+        if (   ( ALARM_NOT_BLOCKED == alarmsBlockedTimer )
+                || ( ALARM_ID_HD_AC_POWER_LOST == alarm )
+                || ( ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT == alarm ) )
         {
             // Broadcast alarm and data if alarm not already active
             if ( FALSE == alarmIsActive[ alarm ] )
@@ -386,11 +386,11 @@
             }
             activateAlarm( alarm );
         }
-        else
-        {
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE, alarm )
-        }
     }
+    else
+    {
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE, alarm )
+    }
 }
 
 /*********************************************************************//**