Initial fix to CATCH.

Now it at least *sometimes* works.