Managing nulls for v1.3