Fix a situation where null were getting into the model on save.