LPS-38516 Fix NPE