LPS-41688 Fix possible NPE
LPS-41688 SF