Use more robust null checker