Fix exception catcher