Allow nulls (16/32)

Allow nulls