diff --git a/src/main/java/fr/inra/oresing/domain/data/deposit/DataImporter.java b/src/main/java/fr/inra/oresing/domain/data/deposit/DataImporter.java
index 79cc8e8ff1f959dadab328abf8a8c30be2ff9326..f93071166fbc30d0d7a4c7b4a99ad40c9db348a6 100644
--- a/src/main/java/fr/inra/oresing/domain/data/deposit/DataImporter.java
+++ b/src/main/java/fr/inra/oresing/domain/data/deposit/DataImporter.java
@@ -170,8 +170,8 @@ public class DataImporter {
         final Stream<RowWithReferenceDatum> recordStreamBeforePreloading =
                 csvRecordsStream
                         .flatMap(csvRecordToReferenceDatumFn)
-                        .map(this::computeComputedColumns)
-                        .map(dataHeaderReader::addConstantsToRow);
+                        .map(dataHeaderReader::addConstantsToRow)
+                        .map(this::computeComputedColumns);
         Stream<RowWithReferenceDatum> recordStream = recursionStrategy.firstPass(recordStreamBeforePreloading);
         final ImmutableSet<LineChecker> transformedLineCheckers = buildLineCheckers();
          Stream<DataValue> referenceValuesStream = recordStream
diff --git a/ui/src/composable/data/dataLoader.js b/ui/src/composable/data/dataLoader.js
index a75577a9027bf8eeefb1645d50485f365f421492..6954e738dda9fdc22c4724bebffe08e10a633e7d 100644
--- a/ui/src/composable/data/dataLoader.js
+++ b/ui/src/composable/data/dataLoader.js
@@ -27,6 +27,9 @@ export function dataLoader(services) {
   };
 
   const getValueDisplay = function (referenceLocal, application) {
+    if(!referenceLocal?.values){
+      return '';
+    }
     if (referenceLocal.values["__display_" + services.internationalisationService.getLocale()]) {
       return referenceLocal.values["__display_" + services.internationalisationService.getLocale()];
     }