HRCPP-86 MSVC clean up exception handling warnings