Merge pull request #6671 from s0undt3ch/develop

If `SHELL` is not in the environ, the error message is different.
Exit if the bootstrap process did not succeed.