cleanup
ExceptionNotifier replaces CatchNotifier