added support for catch handler
ensure it catches the errors and notifications