Updates to Catch and Throw.