add CatchClause scope
fix up patching