Add max retry logic, as suggested by co-pilot

Add max retry logic, as suggested by co-pilot #107