Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r6e86723c766c0097c9867af984c0c7e82802537a -r556e92463ab2f246b151d31d8bcd96b3ee87ad3f
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 6e86723c766c0097c9867af984c0c7e82802537a)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 556e92463ab2f246b151d31d8bcd96b3ee87ad3f)
@@ -784,7 +784,7 @@
 {
     if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_BAD_MSG_CRC ) )
     {
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_COMM_TOO_MANY_BAD_CRCS, (U32)ALARM_SOURCE_HD );
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID__AVAILABLE_4, (U32)ALARM_SOURCE_HD );
     }
 }
 
@@ -1150,9 +1150,12 @@
             handleTesterLogInRequest( message );
             break;
 
+#ifndef _VECTORCAST_
+        // The default cannot be reached in VectorCAST since the cases are run in a for loop
         default:
             // Un-recognized or un-handled message ID received - ignore
-            break;
+            break;
+#endif
     }
 
     // Handle any test messages if tester has logged in successfully
@@ -1654,9 +1657,12 @@
                 handleSetBloodLeakEmbeddedModeCommand( message );
                 break;
 
+#ifndef _VECTORCAST_
+            // The default cannot be reached in VectorCAST since the cases are run in a for loop
             default:
                 // Unrecognized message ID received - ignore
-                break;
+                break;
+#endif
         }
     }
 }