Renamed stop_if_error to stop_on_error