Fix exception handling for Event Handlers