Changed how detecting retry conditions is done.