Merge "Fix CodeNarc warning about empty catch (2nd try)"