Null pointers avoided, fields not null changed