More null checks...