Fix for code Vulnerability,reported by Sonar