diff --git a/anki/storage.py b/anki/storage.py
index b75a54827..842bb6e2d 100644
--- a/anki/storage.py
+++ b/anki/storage.py
@@ -63,7 +63,11 @@ def Collection(
         addBasicModel(col)
         col.save()
     if lock:
-        col.lock()
+        try:
+            col.lock()
+        except:
+            col.db.close()
+            raise
     return col