SOAP-1740 Handle close triggered by user