diff --git a/grep-merges b/grep-merges
index d9cfb3a..c180d92 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 'user' in merge and merge['user'] is not None:
                 author = merge['user']
-            if 'uploader' in merge:
+            if 'uploader' in merge and merge['uploader'] is not None:
                 uploader = '(%s)' % merge['uploader']
             pretty_uploader = ' '.join((author, uploader)).strip()
             if (match is None or