diff --git a/debian/changelog b/debian/changelog
index 4173aaf..74cfe28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ubuntu-dev-tools (0.158) UNRELEASED; urgency=medium
+
+  [ Dmitry Shachnev ]
+  * grep-merges: Do not override author or uploader with None
+    There can be JSON entries which have uploader=None.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri, 13 May 2016 09:04:03 +0200
+
 ubuntu-dev-tools (0.157) unstable; urgency=medium
 
   * mk-sbuild: cp localtime and timezone a little harder (LP: #1569400)
diff --git a/grep-merges b/grep-merges
index d9cfb3a..a06e9aa 100755
--- a/grep-merges
+++ b/grep-merges
@@ -61,9 +61,9 @@ def main():
         for merge in json.loads(page):
             package = merge['source_package']
             author, uploader = '', ''
-            if 'user' in merge:
+            if merge.get('user'):
                 author = merge['user']
-            if 'uploader' in merge:
+            if merge.get('uploader'):
                 uploader = '(%s)' % merge['uploader']
             pretty_uploader = ' '.join((author, uploader)).strip()
             if (match is None or