Fix client disconnects when a server goes down - #886