Reduce unhandled exception handler scope

Merge request reports