Fix: null values are blindly discarted while saving.