diff --git a/web.py b/web.py
index 719bde6..de85fc3 100644
--- a/web.py
+++ b/web.py
@@ -625,8 +625,11 @@ def threads(repository):
     if not os.path.isdir(path):
         bottle.abort(404, 'No repository at this path.')
     
-    repo = pygit2.Repository(path)
-    tree = repo.revparse_single('HEAD').tree
+    try:
+        repo = pygit2.Repository(path)
+        tree = repo.revparse_single('HEAD').tree
+    except:
+        return template('mailing_list/emails.html', list_address=list_address, repository=repository)
     
     threads_list = []
     tags = {}