Remove dead code; added a missing null ptr check.