Ensure that name can't be blank
Ensure empty fields are written as undefined