better fix for null values in property value (should be handled in the
converter)