This fixes #8208.  If the previous raw value is null, the current value is saved as null.  It also always puts in the raw value into the return.