Merge "sonar critical for errorhandling"