Better retrying for NBH.
Merge pull request #195 from square/dimitris/retry

Better retrying.