add CatchClause support