Add checks for null.
3 files changed