Merge "fix potential nullpointer from sonar"