OnException result not returned

Fix issue where result of HandleNonSuccess was ignored which resulted in
multiple calls with retryCount being the same.