diff --git a/pisi/api.py b/pisi/api.py
index 9e4fc031..3894f5e6 100644
--- a/pisi/api.py
+++ b/pisi/api.py
@@ -816,10 +816,12 @@ def remove_repo(name):
 def update_repos(repos, force=False):
     pisi.db.historydb.HistoryDB().create_history("repoupdate")
     updated = False
-    for repo in repos:
-        updated |= __update_repo(repo, force)
-    if updated:
-        pisi.db.regenerate_caches()
+    try:
+        for repo in repos:
+            updated |= __update_repo(repo, force)
+    finally:
+        if updated:
+            pisi.db.regenerate_caches()
 
 @locked
 def update_repo(repo, force=False):