LPS-35198 Fix NPE