Fixed order so that "set -e" doesn't show in build logs