[OT] Really fix possible NULL dereference this time
3 files changed