Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -ra053cecf0673654e2bc03e9a34ff15845c8cff93 -ra15b3ca05344fb3aeb49dc41c384345ec2651ce0
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision a053cecf0673654e2bc03e9a34ff15845c8cff93)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision a15b3ca05344fb3aeb49dc41c384345ec2651ce0)
@@ -7,8 +7,8 @@
 *
 * @file    PresOccl.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      03-Jan-2023
+* @author  (last)      Michael Garthwaite
+* @date    (last)      20-Jan-2023
 *
 * @author  (original)  Sean
 * @date    (original)  15-Jan-2020
@@ -17,7 +17,8 @@
 
 #include "PresOccl.h"
 #include "AirPump.h"
-#include "AlarmMgmt.h"
+#include "AlarmMgmt.h"
+#include "BloodFlow.h"
 #include "FPGA.h"
 #include "ModeTreatmentParams.h"
 #include "NVDataMgmt.h"
@@ -645,7 +646,8 @@
         // and setOcclusionInstallLevel has been called.
         if ( MODE_PRET == getCurrentOperationMode() )
         {
-            if( getPreTreatmentSubState() > HD_PRE_TREATMENT_CART_INSTALL_STATE && getDrySelfTestsState() > DRY_SELF_TESTS_START_STATE )
+            if ( ( TRUE == isBloodPumpRunning() ) && ( getPreTreatmentSubState() > HD_PRE_TREATMENT_CART_INSTALL_STATE )
+                    && ( getDrySelfTestsState() > DRY_SELF_TESTS_START_STATE ) )
             {
                 // Check for occlusion
                 if ( bpOccl > ( OCCLUSION_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall ) )
@@ -658,7 +660,7 @@
         // Check for occlusion in Treatment modes where pumps are moving
         else if ( MODE_TREA == getCurrentOperationMode() )
         {
-            if ( TREATMENT_STOP_STATE != getTreatmentState() )
+            if ( TRUE == isBloodPumpRunning() )
             {
                 // Check for occlusion
                 if ( bpOccl > ( OCCLUSION_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall ) )