Merge "Sonar fix NullPointerException"