Fix doc string
Simplify how exceptions are retried

This also fixes a bug where exceptions we don't want to retry
were not being propogated up.  Added a new test to check for this
case.