Merge "added fix for error log reported in sonar"