add Exception control flow
Merge branch 'stop-throw-ex-if-retry-success'