cherry pick repeat sending request on error