LPS-38455 fix NPE