diff --git a/lib/entropy/db/skel.py b/lib/entropy/db/skel.py
index 34646fa9a..cc3895f2b 100644
--- a/lib/entropy/db/skel.py
+++ b/lib/entropy/db/skel.py
@@ -454,9 +454,10 @@ class EntropyRepositoryBase(TextInterface, EntropyRepositoryPluginStore):
         counter = getattr(self._tls, "_EntropyRepositoryCacheCounter", 0)
         self._tls._EntropyRepositoryCacheCounter = counter + 1
 
-        yield
-
-        self._tls._EntropyRepositoryCacheCounter -= 1
+        try:
+            yield
+        finally:
+            self._tls._EntropyRepositoryCacheCounter -= 1
 
     def directed(self):
         """