Better error handling
Documentation updated
Retry log message improved