Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r596b96528f155bd9f663ed1773fdc80761fc7b31 -r8ba9bec762a05f15cda956997850f06f44c12516
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 596b96528f155bd9f663ed1773fdc80761fc7b31)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 8ba9bec762a05f15cda956997850f06f44c12516)
@@ -255,6 +255,23 @@
 
 /*********************************************************************//**
  * @brief
+ * The verifySwitchStatus function checks Pump Track and Door switches are closed.
+ * Alarm is set if not.
+ * @details Inputs: none
+ * @details Outputs: Alarm
+ * @return none
+ *************************************************************************/
+void verifySwitchStatus( void )
+{
+    if ( STATE_OPEN == getSwitchStatus( FRONT_DOOR ) || STATE_OPEN == getSwitchStatus( PUMP_TRACK_SWITCH ) )
+    {
+        activateAlarmNoData( ALARM_ID_CARTRIDGE_DOOR_OPENED );
+        // TODO: Separate alarm for Pump Track Switch
+    }
+}
+
+/*********************************************************************//**
+ * @brief
  * The signalUserConfirmInstallation function handles user confirmation of
  * disposable installation.
  * @details Inputs: none
@@ -642,10 +659,7 @@
 {
     HD_PRE_TREATMENT_MODE_STATE_T state = HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE;
 
-    if ( STATE_OPEN == getSwitchStatus( FRONT_DOOR ) )
-    {
-        activateAlarmNoData( ALARM_ID_CARTRIDGE_DOOR_OPENED );
-    }
+    verifySwitchStatus();
 
     if ( TRUE == alarmActionResumeReceived )
     {
@@ -705,10 +719,7 @@
 {
     HD_PRE_TREATMENT_MODE_STATE_T state = HD_PRE_TREATMENT_SELF_TEST_DRY_STATE;
 
-    if ( STATE_OPEN == getSwitchStatus( FRONT_DOOR ) )
-    {
-        activateAlarmNoData( ALARM_ID_CARTRIDGE_DOOR_OPENED );
-    }
+    verifySwitchStatus();
 
     if ( TRUE == alarmActionResumeReceived )
     {
@@ -743,10 +754,7 @@
 {
     HD_PRE_TREATMENT_MODE_STATE_T state = HD_PRE_TREATMENT_PRIME_STATE;
 
-    if ( STATE_OPEN == getSwitchStatus( FRONT_DOOR ) )
-    {
-        activateAlarmNoData( ALARM_ID_CARTRIDGE_DOOR_OPENED );
-    }
+    verifySwitchStatus();
 
     if ( TRUE == alarmActionResumeReceived )
     {
@@ -782,10 +790,7 @@
 {
     HD_PRE_TREATMENT_MODE_STATE_T state = HD_PRE_TREATMENT_RECIRCULATE_STATE;
 
-    if ( STATE_OPEN == getSwitchStatus( FRONT_DOOR ) )
-    {
-        activateAlarmNoData( ALARM_ID_CARTRIDGE_DOOR_OPENED );
-    }
+    verifySwitchStatus();
 
     if ( TRUE == alarmActionResumeReceived )
     {