More null checks