Fixed a few bugs in catch