LPS-39662 Null check