diff --git a/build/tools/repopick.py b/build/tools/repopick.py
index 0625378..5f6ef6b 100644
--- a/build/tools/repopick.py
+++ b/build/tools/repopick.py
@@ -267,7 +267,10 @@
             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)