diff --git a/homu/main.py b/homu/main.py
index 346aa398..eaa8445d 100644
--- a/homu/main.py
+++ b/homu/main.py
@@ -1303,7 +1303,7 @@ def fetch_mergeability(mergeable_que):
 
             state.set_mergeable(mergeable, que=False)
 
-        except:
+        except Exception:
             print('* Error while fetching mergeability')
             traceback.print_exc()
 
@@ -1336,7 +1336,7 @@ def check_timeout(states, queue_handler):
 
                         queue_handler()
 
-        except:
+        except Exception:
             print('* Error while checking timeout')
             traceback.print_exc()
 
diff --git a/homu/server.py b/homu/server.py
index 475cde8b..61228e16 100644
--- a/homu/server.py
+++ b/homu/server.py
@@ -695,7 +695,7 @@ def sync_repo(repo_label, g):
             synchronize(repo_label, g.repo_cfgs[repo_label], g.logger, g.gh,
                         g.states, g.repos, g.db, g.mergeable_que,
                         g.my_username, g.repo_labels)
-        except:
+        except Exception:
             print('* Error while synchronizing {}'.format(repo_label))
             traceback.print_exc()
             raise