Exception catcher2

I rebase exception-catcher branch to resolve a conflict.