Merge "Sonar fix npe,logger"