Updated Kernel handling of $catch, and improved code coverage