Merge "Sonar fixes related to exceptions"