Better error handling for service errors