Improve error handling and add fetch retry backoff

Improve error handling and add fetch retry backoff #2589