Merge "sonar critical for error-handling"