Merge "Fix exit code for missing envs"