diff --git a/src/main/java/net/openhft/chronicle/map/OldDeletedEntriesCleanupThread.java b/src/main/java/net/openhft/chronicle/map/OldDeletedEntriesCleanupThread.java
index 3a6253b7d..fd5ac567a 100644
--- a/src/main/java/net/openhft/chronicle/map/OldDeletedEntriesCleanupThread.java
+++ b/src/main/java/net/openhft/chronicle/map/OldDeletedEntriesCleanupThread.java
@@ -120,7 +120,14 @@ class OldDeletedEntriesCleanupThread extends Thread
             return;
 
         while (!shutdown) {
-            int nextSegmentIndex = cleanupSegment();
+            int nextSegmentIndex;
+            try {
+                nextSegmentIndex = cleanupSegment();
+            } catch (Exception e) {
+                if (shutdown)
+                    break;
+                throw e;
+            }
             if (nextSegmentIndex == -1)
                 return;
             if (nextSegmentIndex == 0) {