better error handling on saas unexpected response