diff --git a/src/dexorder/event_handler.py b/src/dexorder/event_handler.py
index 635b7d3..65660be 100644
--- a/src/dexorder/event_handler.py
+++ b/src/dexorder/event_handler.py
@@ -273,10 +273,6 @@ def finish_execution_request(req: TrancheExecutionRequest, error: str):
     except KeyError:
         pass
     if error != '':
-        if error == 'NO':
-            # order is not open
-            log.error(f'Order {OrderKey(tk.vault,tk.order_index)} was closed, undetected!')
-            order.complete(SwapOrderState.Expired)
         log.debug(f'execution request for tranche {tk} had error "{error}"')
     if error == '':
         log.debug(f'execution request for tranche {tk} was successful!')
@@ -285,6 +281,10 @@ def finish_execution_request(req: TrancheExecutionRequest, error: str):
         # todo vault balance checks
         token = order.order.tokenIn
         log.debug(f'insufficient funds {req.vault} {token} ')
+    elif error == 'NO':
+        # order is not open
+        log.error(f'order {OrderKey(tk.vault,tk.order_index)} was closed, undetected!')
+        order.complete(SwapOrderState.Expired)
     elif error == 'TF':
         # Tranche Filled
         log.warning(f'tranche already filled {tk}')