Fixes for exception_notifier