Fixed a couple of instances where we used (non-theadsafe) Catch macros concurrently.