Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r6cd114c4deffb81e85c6cd3ebaf550fe4661efda -r9feea867113c62088f0ce91750127972dbd9bf53
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 6cd114c4deffb81e85c6cd3ebaf550fe4661efda)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 9feea867113c62088f0ce91750127972dbd9bf53)
@@ -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 )
     }
 }
 
@@ -1017,8 +1017,6 @@
         }
     }
 
-    // TODO - if no open slot found, s/w fault
-
     return result;
 }