Merge "sonar major for error-handling"

No match.