Improve behavior when API returns valid errors