Merge "sonar critical for Exception Handling"

No match.