Refactor ready for retry exception types