HH-40000 fix exception handling
Merge remote-tracking branch 'origin/HH-40000' into release-candidate