Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r91aa11a47f3b3c744cbbfd9e9c1bd240263aa1bd -rab57180655892575252175a4310d97a1c8c46e74
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 91aa11a47f3b3c744cbbfd9e9c1bd240263aa1bd)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision ab57180655892575252175a4310d97a1c8c46e74)
@@ -409,8 +409,8 @@
     }
     else
     {
-        // Should not get here - not an active message box
-        // TODO - s/w fault?
+        // Should not get here - not an active message box
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_CAN_MESSAGE_BOX, srcCANBox )
     }
 }
 
@@ -1019,8 +1019,6 @@
         }
     }
 
-    // TODO - if no open slot found, s/w fault
-
     return result;
 }
 
@@ -1309,15 +1307,19 @@
             handleUIPOSTFinalResult( message );
             break;
 
-        // NOTE: this always must be the last case
-        case MSG_ID_TESTER_LOGIN_REQUEST:
-            handleTesterLogInRequest( message );
+        case MSG_ID_UI_ACTIVE_ALARMS_LIST_REQUEST:
+            handleUIActiveAlarmsListRequest( message );
             break;
 
         case MSG_ID_HD_SET_STANDBY_DISINFECT_SUB_MODE_REQUEST:
             handleSetHDStandbyDisinfectSubmodeRequest( message );
             break;
 
+        // NOTE: this always must be the last case
+        case MSG_ID_TESTER_LOGIN_REQUEST:
+            handleTesterLogInRequest( message );
+            break;
+
         default:
             // Un-recognized or un-handled message ID received - ignore
             break;