LPS-49457 fix Possible NPE