More null ptr fix.