bug on save when property is null