Make it more robust when server goes away