diff --git a/recipes/recipe_modules/bot_update/resources/bot_update.py b/recipes/recipe_modules/bot_update/resources/bot_update.py
index 7e3de71fa..b3c8241d7 100755
--- a/recipes/recipe_modules/bot_update/resources/bot_update.py
+++ b/recipes/recipe_modules/bot_update/resources/bot_update.py
@@ -452,7 +452,9 @@ def create_manifest(gclient_output, patch_root, gerrit_ref):
     revision = info.get('revision', '')
     # The format of the url is "https://repo.url/blah.git@abcdefabcdef" or
     # just "https://repo.url/blah.git"
-    url_split = info.get('url', '').split('@')
+    url_split = info.get('url')
+    if url_split is not None:
+      url_split = url_split.split('@')
     if not revision and len(url_split) == 2:
       revision = url_split[1]
     if url_split: