Fixing some bugs with catching