Added work for recovering from server error