LPS-42052 Fix NPE