Fix scoping and bubble up error on retry
Merge pull request #18 from uber/fixups

Fix scoping and bubble up error on retry