Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r8373758a03ea82b46b4b313d2f2b24e3974a17f6 -rc71ff8d9b1c3efea8649e11d12da472f06a5a511
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 8373758a03ea82b46b4b313d2f2b24e3974a17f6)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision c71ff8d9b1c3efea8649e11d12da472f06a5a511)
@@ -59,11 +59,13 @@
 #define ARTERIAL_PRESSURE_SELF_TEST_MAX     ( 100.0F )                                      ///< Maximum self-test value for arterial pressure sensor reading (in mmHg).
 #define ARTERIAL_PRESSURE_MAX_MMHG          ( 2000.0F )                                     ///< Maximum arterial pressure reading (in mmHg) for range check.
 #define ARTERIAL_PRESSURE_MIN_MMHG          ( -1500.0F )                                    ///< Minimum arterial pressure reading (in mmHg) for range check.
+#define ARTERIAL_PRESSURE_ND_MIN_MMHG       ( -250.0F )                                     ///< Minimum arterial pressure reading (in mmHg) when not dialyzing.
 
 #define VENOUS_PRESSURE_SELF_TEST_MIN       ( -100.0F )                                     ///< Minimum self-test value for venous pressure sensor reading (in mmHg).
 #define VENOUS_PRESSURE_SELF_TEST_MAX       ( 600.0F )                                      ///< Maximum self-test value for venous pressure sensor reading (in mmHg).
 #define VENOUS_PRESSURE_MAX_MMHG            ( 2000.0F )                                     ///< Maximum venous pressure reading (in mmHg) for range check.
 #define VENOUS_PRESSURE_MIN_MMHG            ( -1500.0F )                                    ///< Minimum venous pressure reading (in mmHg) for range check.
+#define VENOUS_PRESSURE_ND_MAX_MMHG         ( 300.0F )                                      ///< Maximum venous pressure reading (in mmHg) when not dialyzing.
 
 #define PSI_TO_MMHG                         ( 51.7149F )                                    ///< Conversion factor for converting PSI to mmHg.
 
@@ -585,7 +587,8 @@
         }
 
         // Check arterial pressure during treatment mode
-        if ( ( MODE_TREA == getCurrentOperationMode() ) && ( getTreatmentState() <= TREATMENT_DIALYSIS_STATE ) )
+        if ( ( MODE_TREA == getCurrentOperationMode() ) &&
+                ( getTreatmentState() <= TREATMENT_DIALYSIS_STATE && getDialysisState() != DIALYSIS_SALINE_BOLUS_STATE ) )
         {
             F32 artLowLimit  = (F32)getTreatmentParameterS32( TREATMENT_PARAM_ART_PRESSURE_LOW_LIMIT );
             F32 artHighLimit = (F32)getTreatmentParameterS32( TREATMENT_PARAM_ART_PRESSURE_HIGH_LIMIT );
@@ -608,6 +611,16 @@
                 SET_ALARM_WITH_2_F32_DATA( ALARM_ID_ARTERIAL_PRESSURE_HIGH, artPres, artHighLimit );
             }
         }
+        else if (( MODE_TREA == getCurrentOperationMode() ) && ( TREATMENT_STOP_STATE == getTreatmentState() ||
+                 TREATMENT_RINSEBACK_STATE == getTreatmentState() || TREATMENT_RECIRC_STATE == getTreatmentState() ||
+                 TREATMENT_END_STATE == getTreatmentState()))
+        {
+            // Check arterial pressure is within non-treatment alarm limits
+            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_ARTERIAL_PRESSURE_LOW, artPres < ARTERIAL_PRESSURE_ND_MIN_MMHG ) )
+            {
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_ARTERIAL_PRESSURE_LOW, artPres, ARTERIAL_PRESSURE_ND_MIN_MMHG );
+            }
+        }
         else
         {   // Reset persistence if alarm is out of scope
             isPersistentAlarmTriggered( ALARM_ID_ARTERIAL_PRESSURE_LOW, FALSE );
@@ -640,7 +653,8 @@
         }
 
         // Check venous pressure during treatment mode
-        if ( ( MODE_TREA == getCurrentOperationMode() ) && ( getTreatmentState() <= TREATMENT_DIALYSIS_STATE ) )
+        if ( ( MODE_TREA == getCurrentOperationMode() ) &&
+                ( getTreatmentState() <= TREATMENT_DIALYSIS_STATE && getDialysisState() != DIALYSIS_SALINE_BOLUS_STATE ) )
         {
             F32 venLowLimit  = (F32)getTreatmentParameterS32( TREATMENT_PARAM_VEN_PRESSURE_LOW_LIMIT );
             F32 venHighLimit = (F32)getTreatmentParameterS32( TREATMENT_PARAM_VEN_PRESSURE_HIGH_LIMIT );
@@ -670,6 +684,16 @@
                 SET_ALARM_WITH_2_F32_DATA( ALARM_ID_VENOUS_PRESSURE_HIGH, venPres, venHighLimit );
             }
         }
+        else if ( ( MODE_TREA == getCurrentOperationMode() ) && ( TREATMENT_STOP_STATE == getTreatmentState() ||
+                    TREATMENT_RINSEBACK_STATE == getTreatmentState() || TREATMENT_RECIRC_STATE == getTreatmentState() ||
+                    TREATMENT_END_STATE == getTreatmentState()))
+        {
+            // Check venous pressure is less than non-treatment alarm limit
+            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_VENOUS_PRESSURE_HIGH, venPres > VENOUS_PRESSURE_ND_MAX_MMHG ) )
+            {
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_VENOUS_PRESSURE_HIGH, venPres, VENOUS_PRESSURE_ND_MAX_MMHG );
+            }
+        }
         else
         {   // Reset persistence if alarm is out of scope
             isPersistentAlarmTriggered( ALARM_ID_VENOUS_PRESSURE_LOW, FALSE );