diff --git a/piker/clearing/_util.py b/piker/clearing/_util.py
index 9eebf1c4d..d3c0fb8ef 100644
--- a/piker/clearing/_util.py
+++ b/piker/clearing/_util.py
@@ -90,4 +90,7 @@ def pop(
         for the given order id.
 
         '''
-        return self._flows.pop(oid)
+        if (flow := self._flows.pop(oid, None)) is None:
+            log.warning(f'No flow found for oid: {oid}')
+
+        return flow