Fix CatchClause order
Merge branch 'wrong-catch-clauses-order' into vb-build