Started implementing recovering from client faults