Changed the handling of web service errors