LPS-33621 Null check fix in WallUtil