Removing more NULL refs