Fix unnecessary NULL checks
3 files changed