We used to catch errors and retry, but I feel like we weren't resetting
things correctly. This seems to work.

cc @schmavery @jaredly