Merge "Sonar fix log exception"

No match.