Fixed the collapsion of fields value in data

I forgot to check if data was set first.