Improved error handling on service responses