Index: firmware/App/Services/Interrupts.c
===================================================================
diff -u -r6ddc5298786a4b5055f75330c49b62c6ae7adeb0 -r8466e63f95f65a3ffb18c3af85ac99328e41167b
--- firmware/App/Services/Interrupts.c	(.../Interrupts.c)	(revision 6ddc5298786a4b5055f75330c49b62c6ae7adeb0)
+++ firmware/App/Services/Interrupts.c	(.../Interrupts.c)	(revision 8466e63f95f65a3ffb18c3af85ac99328e41167b)
@@ -117,7 +117,7 @@
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_UNEXPECTED_RTI_INTERRUPT, notification )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_RTI_NOTIFICATION, notification )
             break;
     }
 }
@@ -203,23 +203,19 @@
         {
             sci2FrameErrorCnt++;
             clearSCI2CommErrors();
-#ifndef DEBUG_ENABLED
             if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_UART_FRAME_ERROR ) )
             {
                 SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_UART_FRAME_ERROR )
             }
-#endif
         }
         if ( ( flags & SCI_OE_INT ) != 0 )
         {
             sci2OverrunErrorCnt++;
             clearSCI2CommErrors();
-#ifndef DEBUG_ENABLED
             if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_UART_OVERRUN ) )
             {
                 SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_UART_OVERRUN_ERROR )
             }
-#endif
         }
     }
 }