More errexit compliance