* Fixed MaxRetryError exception handling