LPS-48350 fix NPE