ADD: More null checks