diff --git a/update_depot_tools b/update_depot_tools
index bc163f80d..0901e4a75 100755
--- a/update_depot_tools
+++ b/update_depot_tools
@@ -121,7 +121,10 @@ if [ "X$DEPOT_TOOLS_UPDATE" != "X0" ]; then
 
   # Sync CIPD and CIPD client tools.
   source "$base_dir/cipd_bin_setup.sh"
-  cipd_bin_setup
+  cipd_bin_setup || {
+    echo "CIPD bootstrap failed"
+    exit 1
+  }
 
   find "$base_dir" -iname "*.pyc" -exec rm -f {} \;
 fi