Added management of  server crashes on client side