diff --git a/libraries/entropy/cache.py b/libraries/entropy/cache.py
index b4c34f41c..4b06e6312 100644
--- a/libraries/entropy/cache.py
+++ b/libraries/entropy/cache.py
@@ -101,7 +101,8 @@ class EntropyCacher(Singleton):
             with self.__cache_lock:
                 try:
                     data = self.__cache_buffer.pop()
-                except ValueError:
+                except (ValueError, TypeError,):
+                    # TypeError is when objects are being destroyed
                     break # stack empty
             key, data = data
             d_o = self.dumpTools.dumpobj