Fix exception handling issues reported by SonarCloud