diff --git a/build_library/toolchain_util.sh b/build_library/toolchain_util.sh
index 8ed67eb630..93f288a453 100644
--- a/build_library/toolchain_util.sh
+++ b/build_library/toolchain_util.sh
@@ -201,8 +201,10 @@ get_sdk_binhost() {
         # but normally it is not needed because everything is already part of the tarball.
         # To install the crossdev Rust package, /toolchain-arm64/ is derived from /toolchain/
         # when necessary in install_cross_toolchain().
-        echo "${FLATCAR_DEV_BUILDS_SDK}/${arch}/${ver}/toolchain/"
-        echo "${FLATCAR_DEV_BUILDS_SDK}/${arch}/${ver}/pkgs/"
+        if curl -Ifs -o /dev/null "${FLATCAR_DEV_BUILDS_SDK}/${arch}/${ver}/pkgs/"; then
+            echo "${FLATCAR_DEV_BUILDS_SDK}/${arch}/${ver}/toolchain/"
+            echo "${FLATCAR_DEV_BUILDS_SDK}/${arch}/${ver}/pkgs/"
+        fi
     done
 }
 
diff --git a/update_chroot b/update_chroot
index 73cfa1ca8e..852ce2e627 100755
--- a/update_chroot
+++ b/update_chroot
@@ -188,7 +188,7 @@ if [ "${FLAGS_usepkg}" -eq "${FLAGS_TRUE}" ]; then
   if [[ "${FLAGS_usepkgonly}" -eq "${FLAGS_TRUE}" ]]; then
     EMERGE_FLAGS+=( --usepkgonly --rebuilt-binaries n )
   fi
-  if [ "${FLAGS_getbinpkg}" -eq "${FLAGS_TRUE}" ]; then
+  if [ "${FLAGS_getbinpkg}" -eq "${FLAGS_TRUE}" ] && [ -n "${PORTAGE_BINHOST// }" ]; then
     EMERGE_FLAGS+=( --getbinpkg )
   fi