Add a NULL check
2 files changed