Rever logic so that is does not get catched up by set -e