* Add additional logs * Improve error logging * Wait before rerunning attribute checks * Modify retry logic