Added extra conditions to retry logic

What's the effect of this limitation?