diff --git a/docker_registry/lib/index/db.py b/docker_registry/lib/index/db.py
index e9d4c68d2..9e1607364 100644
--- a/docker_registry/lib/index/db.py
+++ b/docker_registry/lib/index/db.py
@@ -113,7 +113,11 @@ def _generate_index(self, session):
         session.add(Version(id=self.version))
         for repository in self._walk_storage(store=store):
             session.add(Repository(**repository))
-        session.commit()
+        try:
+            session.commit()
+        except Exception as e:
+            logger.exception(str(e))
+            session.rollback()
 
     @retry
     def _handle_repository_created(