Moved CATCH over to my personal fork.
Fixed breakage on GCC.