Fail on first failure issue #5