Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -ra75923f40bea362b44fc082ce8eebde7bfa97c9a -rfdaea534d10067404de9bd14b91b2a81d0a7e5ef
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision a75923f40bea362b44fc082ce8eebde7bfa97c9a)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision fdaea534d10067404de9bd14b91b2a81d0a7e5ef)
@@ -649,7 +649,7 @@
                     // add new message to queue for later processing
                     addToMsgQueue( MSG_Q_IN, &rcvMsg );
                     // if message from HD broadcast channel, update HD comm status
-                    if ( COMM_BUFFER_IN_CAN_HD_BROADCAST == i )
+                    if ( COMM_BUFFER_IN_CAN_HD_BROADCAST == MSG_IN_BUFFERS[ i ] )
                     {
                         hdIsCommunicating = TRUE;
                         timeOfLastHDCheckIn = getMSTimerCount();
@@ -817,7 +817,9 @@
     if ( TRUE == didTimeout( timeOfLastHDCheckIn, HD_COMM_TIMEOUT_IN_MS ) )
     {
         hdIsCommunicating = FALSE;
-        //activateAlarmNoData( ALARM_ID_HD_COMM_TIMEOUT );  // TODO - add this alarm if we're in middle of a treatment? or if in a mode that comm loss would impact badly?
+#ifndef DEBUG_ENABLED
+        activateAlarmNoData( ALARM_ID_HD_COMM_TIMEOUT );  // TODO - add this alarm if we're in middle of a treatment? or if in a mode that comm loss would impact badly?
+#endif
     }
 }