Readded exception catcher