Merge "sonar design for error-handling"