fix base url + fail fast on error