acu159966 Some tweaks to when report/error handlers get run