LPS-25368 Added null checks
LPS-25368 SF (Not related to the bug)
LPS-25368 More null checks (not related to the bug)