Replaced multi-catch with single catches multiple times