better null state support