diff --git a/build/tools/repopick.py b/build/tools/repopick.py
index 66343579..cb14ae7a 100755
--- a/build/tools/repopick.py
+++ b/build/tools/repopick.py
@@ -268,7 +268,10 @@ if __name__ == '__main__':
             continue
 
         change = int(change)
-        patchset = int(patchset)
+
+        if patchset is not None:
+            patchset = int(patchset)
+
         review = next((x for x in reviews if x['number'] == change), None)
         if review is None:
             print('Change %d not found, skipping' % change)