diff --git a/contrib/fromupstream.py b/contrib/fromupstream.py
index 3fd4a28..fa28e87 100755
--- a/contrib/fromupstream.py
+++ b/contrib/fromupstream.py
@@ -503,8 +503,11 @@
     bugs += ['chromium:%d' % x for x in args['crbug']]
     bugs = ', '.join(bugs)
     bugs = _remove_dup_bugs(bugs)
-    bug_lines = [x.strip(' ,') for x in
-                 _wrap_commit_line('BUG=', bugs).split('\n')]
+    if bugs:
+        bug_lines = [x.strip(' ,') for x in
+                     _wrap_commit_line('BUG=', bugs).split('\n')]
+    else:
+        bug_lines = []
 
     test_lines = [_wrap_commit_line('TEST=', x) for x in args['test']]