changed back to aborting if there's an error