Allow null values again...

And test thoroughly again