RTGOV-311 Further refinement as now possible to directly throw handler exception