More null deref fixes.