Updated pull request. Shawn had a similar comment about the infinite loop. That was already there. I moved the incrementation to the beginning of the `try` and dropped `warn` down to `info`. This way, if there's an infinite loop, we'll get an alert after 15 attempts (which would not take long - the retries as you can see are set to 5 seconds).