Merge "sonar major for error-handling"