Events Exception restructure