Merge "pass stop_on_error to _has_error_in_logs"