Soap: Improve error handling