Re-added Catch! to the normal build and fixed it to match changes in the API.