Merge "sonar critical for Exception Handling"