Improve error handling in Java WS Client