Merge "sonar-463-remove the declaration of thrown exception"