don't erroneously reset max_retries
improve max-retries exceeded message