LPS-33717 PACL - eliminate possibility of NPE