diff --git a/envsetup.sh b/envsetup.sh
index 8a995c7..368f73d 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -719,6 +719,10 @@
     set_stuff_for_environment
     [[ -n "${ANDROID_QUIET_BUILD:-}" ]] || printconfig
     destroy_build_var_cache
+
+    if [[ -n "${CHECK_MU_CONFIG:-}" ]]; then
+      check_mu_config
+    fi
 }
 
 unset COMMON_LUNCH_CHOICES_CACHE