diff --git a/api/src/org/labkey/api/data/DbScope.java b/api/src/org/labkey/api/data/DbScope.java
index 502ff95c684..afe69fbff21 100644
--- a/api/src/org/labkey/api/data/DbScope.java
+++ b/api/src/org/labkey/api/data/DbScope.java
@@ -2385,12 +2385,17 @@ public void run(TransactionImpl transaction)
             // Copy to avoid ConcurrentModificationExceptions, need to retain original order from LinkedHashMap
             List<Runnable> tasks = new ArrayList<>(getRunnables(transaction).keySet());
 
-            for (Runnable task : tasks)
+            try
             {
-                task.run();
+                for (Runnable task : tasks)
+                {
+                    task.run();
+                }
+            }
+            finally
+            {
+                transaction.closeCaches();
             }
-
-            transaction.closeCaches();
         }
 
         public <T extends Runnable> T add(TransactionImpl transaction, T task)