diff --git a/libraries/entropy/client/interfaces/package.py b/libraries/entropy/client/interfaces/package.py
index 4758e1861..bb2fc0e75 100644
--- a/libraries/entropy/client/interfaces/package.py
+++ b/libraries/entropy/client/interfaces/package.py
@@ -2069,12 +2069,10 @@ class Package:
 
         # lock
         self.Entropy.resources_create_lock()
-
         try:
             rc = self.run_stepper(xterm_header)
-        except:
+        finally:
             self.Entropy.resources_remove_lock()
-            raise
 
         # remove lock
         self.Entropy.resources_remove_lock()
diff --git a/libraries/entropy/client/interfaces/repository.py b/libraries/entropy/client/interfaces/repository.py
index 2f4fc0c70..8a58c7613 100644
--- a/libraries/entropy/client/interfaces/repository.py
+++ b/libraries/entropy/client/interfaces/repository.py
@@ -1932,10 +1932,10 @@ class Repository:
         self.Entropy.resources_create_lock()
         try:
             rc = self.run_sync()
-        except:
+        finally:
             self.Entropy.resources_remove_lock()
-            raise
-        if rc: return rc
+        if rc:
+            return rc
 
         # remove lock
         self.Entropy.resources_remove_lock()