Apply multi-catch
5 files changed