diff --git a/build_library/update_chroot_util.sh b/build_library/update_chroot_util.sh
index e76fbeb365..3fd88e02d8 100644
--- a/build_library/update_chroot_util.sh
+++ b/build_library/update_chroot_util.sh
@@ -6,7 +6,7 @@ get_versions_from_equery() {
     local equery_cmd="${1}"
     local pkg="${2}"
 
-    "${equery_cmd}" --quiet --no-color list --format='${version} ${fullversion}' "${pkg}"
+    "${equery_cmd}" --quiet --no-color list --format='${version} ${fullversion}' "${pkg}" || :
 }
 
 filter_out_too_new() {
diff --git a/update_chroot b/update_chroot
index a36438ee9f..73cfa1ca8e 100755
--- a/update_chroot
+++ b/update_chroot
@@ -248,7 +248,8 @@ info "Maybe removing some hard blocks"
 # versions have !!<dev-python/setuptools_scm-2 in BDEPEND).
 remove_hard_blocks \
     sudo_e_emerge equery \
-    dev-python/setuptools_scm:2
+    dev-python/setuptools_scm:2 \
+    dev-python/setuptools-scm:2
 
 # Second pass, update everything else.
 EMERGE_FLAGS+=( --deep )