Fix missing null pointer check