LPS-33320 null check
Revert "LPS-33320 null check"

This reverts commit 0427c1d5c63193d1162be97812735fd830a53083.
LPS-33320 Proper fix