Proper fix for #1755. Retry should raise exc if no current exception.