LPS-46832 Avoid potential NullPointedException