LPS-49277 Fix a NPE