PAXWEB-535 shut down more gracefull