LPS-41514 Fix NPE