Convert Event Bus to use custom exception handler