Add retry logic in case not all state information can be retrieved.
Test with mocked client errors