Fix NRE, set SoapMessage in the right place