Moved the fail on error