Improved handling of SOAP message