Pull retry logic back out of exception handler