Merge "Sonar fix log exception"