Fixed exit without set -e