LPS-41597
LPS-41514 Fix NPE