LPS-38424 fix possible NPE