Make sure we retry a call before iteration too

Add retry loop before our while