diff --git a/debian/changelog b/debian/changelog
index f9ec9a6..1ee3cee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ubuntu-dev-tools (0.168) UNRELEASED; urgency=medium
+
+  * grep-merges: flake8-clean.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 07 May 2019 21:24:14 -0700
+
 ubuntu-dev-tools (0.167) eoan; urgency=medium
 
   [ Colin Watson ]
diff --git a/grep-merges b/grep-merges
index aaff1e1..3206920 100755
--- a/grep-merges
+++ b/grep-merges
@@ -68,12 +68,14 @@ def main():
                 uploader = '(%s)' % merge['uploader']
             try:
                 teams = merge['teams']
-            except:
+            except e:
                 teams = []
 
             pretty_uploader = u'{} {}'.format(author, uploader)
-            if match is None or match in package or match in author or match in uploader or match in teams:
-                print '%s\t%s' % (package.encode("utf-8"), pretty_uploader.encode("utf-8"))
+            if (match is None or match in package or match in author
+               or match in uploader or match in teams):
+                print '%s\t%s' % (package.encode("utf-8"),
+                                  pretty_uploader.encode("utf-8"))
 
 
 if __name__ == '__main__':