Added reasonable error handling & throttling of retries