diff --git a/api/src/org/labkey/api/exp/api/SampleTypeService.java b/api/src/org/labkey/api/exp/api/SampleTypeService.java
index 0a5b601ad73..bcfbb85c86c 100644
--- a/api/src/org/labkey/api/exp/api/SampleTypeService.java
+++ b/api/src/org/labkey/api/exp/api/SampleTypeService.java
@@ -30,6 +30,7 @@
 import org.labkey.api.gwt.client.model.GWTIndex;
 import org.labkey.api.gwt.client.model.GWTPropertyDescriptor;
 import org.labkey.api.lists.permissions.ManagePicklistsPermission;
+import org.labkey.api.ontology.Unit;
 import org.labkey.api.qc.DataState;
 import org.labkey.api.query.BatchValidationException;
 import org.labkey.api.query.ValidationException;
@@ -54,8 +55,8 @@
 
 public interface SampleTypeService
 {
-    String MISSING_COLUMN_ERROR_MESSAGE_PATTERN = "When adding or updating samples, the %s column must be provided when the %s column is.";
-    String MISSING_COLUMN_VALUE_ERROR_MESSAGE_PATTERN = "When adding or updating samples, a %s value must be provided when there is a value for %s.";
+    String MISSING_AMOUNT_ERROR_MESSAGE = "An Amount value must be provided when Units are provided.";
+    String MISSING_UNITS_ERROR_MESSAGE = "A Units value must be provided when Amounts are provided.";
     String UNPROVIDED_VALUE_ERROR_MESSAGE_PATTERN = "No %s value provided for %s %s.";
     String NEW_SAMPLE_TYPE_ALIAS_VALUE = "{{this_sample_set}}";
     String MATERIAL_INPUTS_PREFIX = "MaterialInputs/";
@@ -114,6 +115,12 @@ static void setInstance(SampleTypeService impl)
         ServiceRegistry.get().registerService(SampleTypeService.class, impl);
     }
 
+    @NotNull
+    List<Unit> getSupportedUnits();
+
+    @Nullable
+    Unit getValidatedUnit(@Nullable Object rawUnits, @Nullable Unit defaultUnits, @Nullable String sampleTypeName);
+
     Map<String, ExpSampleType> getSampleTypesForRoles(Container container, ContainerFilter filter, ExpProtocol.ApplicationType type);
 
     /**
diff --git a/api/src/org/labkey/api/ontology/KindOfQuantity.java b/api/src/org/labkey/api/ontology/KindOfQuantity.java
index ad80ae0cd00..cd51aeb5e6b 100644
--- a/api/src/org/labkey/api/ontology/KindOfQuantity.java
+++ b/api/src/org/labkey/api/ontology/KindOfQuantity.java
@@ -20,7 +20,7 @@ public enum KindOfQuantity
         @Override
         public List<Unit> getCommonUnits()
         {
-            return List.of(Unit.L, Unit.mL, Unit.uL);
+            return List.of(Unit.kL, Unit.L, Unit.mL, Unit.uL);
         }
     },
 
diff --git a/api/src/org/labkey/api/ontology/Unit.java b/api/src/org/labkey/api/ontology/Unit.java
index 7a547dbd156..1cb963687a7 100644
--- a/api/src/org/labkey/api/ontology/Unit.java
+++ b/api/src/org/labkey/api/ontology/Unit.java
@@ -9,7 +9,6 @@
 import org.labkey.api.data.ConversionExceptionWithMessage;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.function.Function;
 
 public enum Unit
@@ -76,8 +75,6 @@ public enum Unit
             Quantity.Mass_pg.class,
             "picogram", "picograms");
 
-    private static final String CONVERSION_EXCEPTION_MESSAGE ="Units value (%s) is not compatible with the display units (%s).";
-
     @Getter
     final @NotNull KindOfQuantity kindOfQuantity;
     @Getter
@@ -198,38 +195,6 @@ public Quantity convert(@Nullable Object value)
         return Quantity.convert(value, this);
     }
 
-    public static Unit getValidatedUnit(@Nullable Object rawUnits, @Nullable Unit defaultUnits)
-    {
-        if (rawUnits == null)
-            return null;
-        if (rawUnits instanceof Unit u)
-        {
-            if (defaultUnits == null)
-                return u;
-            else if (u.kindOfQuantity != defaultUnits.kindOfQuantity)
-                throw new ConversionExceptionWithMessage(String.format(CONVERSION_EXCEPTION_MESSAGE, rawUnits, defaultUnits));
-            else
-                return u;
-        }
-        if (!(rawUnits instanceof String rawUnitsString))
-            throw new ConversionExceptionWithMessage(String.format(CONVERSION_EXCEPTION_MESSAGE, rawUnits, defaultUnits));
-        if (!StringUtils.isBlank(rawUnitsString))
-        {
-            rawUnitsString = rawUnitsString.trim();
-
-            Unit mUnit = Unit.fromName(rawUnitsString);
-            if (mUnit == null)
-            {
-                List<Unit> commonUnits = KindOfQuantity.getSupportedUnits();
-                throw new ConversionExceptionWithMessage("Unsupported Units value (" + rawUnitsString + ").  Supported values are: " + StringUtils.join(commonUnits, ", ") + ".");
-            }
-            if (defaultUnits != null && mUnit.kindOfQuantity != defaultUnits.kindOfQuantity)
-                throw new ConversionExceptionWithMessage(String.format(CONVERSION_EXCEPTION_MESSAGE, rawUnits, defaultUnits));
-            return mUnit;
-        }
-        return null;
-    }
-
     public static class TestCase extends Assert
     {
         @Test
@@ -325,56 +290,5 @@ public void testFromName()
             assertNull(Unit.fromName(""));
         }
 
-        @Test
-        public void testGetValidatedUnit()
-        {
-            try
-            {
-                Unit.getValidatedUnit("g", Unit.mg);
-                Unit.getValidatedUnit("g ", Unit.mg);
-                Unit.getValidatedUnit(" g ", Unit.mg);
-            }
-            catch (ConversionExceptionWithMessage e)
-            {
-                fail("Compatible unit should not throw exception.");
-            }
-            try
-            {
-                assertNull(Unit.getValidatedUnit(null, Unit.unit));
-            }
-            catch (ConversionExceptionWithMessage e)
-            {
-                fail("null units should be null");
-            }
-            try
-            {
-                assertNull(Unit.getValidatedUnit("", Unit.unit));
-            }
-            catch (ConversionExceptionWithMessage e)
-            {
-                fail("empty units should be null");
-            }
-            try
-            {
-                Unit.getValidatedUnit("g", Unit.unit);
-                fail("Units that are not comparable should throw exception.");
-            }
-            catch (ConversionExceptionWithMessage ignore)
-            {
-
-            }
-
-            try
-            {
-                Unit.getValidatedUnit("nonesuch", Unit.unit);
-                fail("Invalid units should throw exception.");
-            }
-            catch (ConversionExceptionWithMessage ignore)
-            {
-
-            }
-
-        }
-
     }
 }
diff --git a/experiment/resources/schemas/exp.xml b/experiment/resources/schemas/exp.xml
index 0330b5c5e69..1a3347f50df 100644
--- a/experiment/resources/schemas/exp.xml
+++ b/experiment/resources/schemas/exp.xml
@@ -223,7 +223,7 @@
           <column columnName="Name" >
               <!--
                 Resolve lists by "name" instead of "listId" as "name" will resolve cross-folder
-                where as "listId"s are only unique within a folder.
+                whereas "listId"s are only unique within a folder.
               -->
               <url>/list/grid.view?name=${Name}</url>
           </column>
diff --git a/experiment/src/org/labkey/experiment/ExperimentModule.java b/experiment/src/org/labkey/experiment/ExperimentModule.java
index 8529150b446..ddf89a9b3bd 100644
--- a/experiment/src/org/labkey/experiment/ExperimentModule.java
+++ b/experiment/src/org/labkey/experiment/ExperimentModule.java
@@ -1039,6 +1039,7 @@ public Set<Class> getIntegrationTests()
             LineageTest.class,
             OntologyManager.TestCase.class,
             PropertyServiceImpl.TestCase.class,
+            SampleTypeServiceImpl.TestCase.class,
             StorageNameGenerator.TestCase.class,
             StorageProvisionerImpl.TestCase.class,
             UniqueValueCounterTestCase.class
diff --git a/experiment/src/org/labkey/experiment/api/ExpSampleTypeImpl.java b/experiment/src/org/labkey/experiment/api/ExpSampleTypeImpl.java
index 85087c513de..0b42122ac78 100644
--- a/experiment/src/org/labkey/experiment/api/ExpSampleTypeImpl.java
+++ b/experiment/src/org/labkey/experiment/api/ExpSampleTypeImpl.java
@@ -557,11 +557,11 @@ public void createSampleNames(@NotNull List<Map<String, Object>> maps,
         {
             // Failed to generate a name due to some part of the expression not in the row
             if (hasNameExpression())
-                throw new ExperimentException("Failed to generate name for sample on row " + e.getRowNumber(), e);
+                throw new ExperimentException("Failed to generate name for sample.", e);
             else if (hasNameAsIdCol())
-                throw new ExperimentException("SampleID or Name is required for sample on row " + e.getRowNumber(), e);
+                throw new ExperimentException("SampleID or Name is required for sample.", e);
             else
-                throw new ExperimentException("All id columns are required for sample on row " + e.getRowNumber(), e);
+                throw new ExperimentException("All id columns are required for sample.", e);
         }
     }
 
@@ -609,7 +609,7 @@ public String createSampleName(@NotNull Map<String, Object> rowMap,
         }
         catch (NameGenerator.NameGenerationException e)
         {
-            throw new ExperimentException("Failed to generate name for Sample", e);
+            throw new ExperimentException("Failed to generate name for sample.", e);
         }
     }
 
diff --git a/experiment/src/org/labkey/experiment/api/ExpSampleTypeTableImpl.java b/experiment/src/org/labkey/experiment/api/ExpSampleTypeTableImpl.java
index 93af4125c9d..e844b9e20a2 100644
--- a/experiment/src/org/labkey/experiment/api/ExpSampleTypeTableImpl.java
+++ b/experiment/src/org/labkey/experiment/api/ExpSampleTypeTableImpl.java
@@ -64,11 +64,16 @@ public MutableColumnInfo createColumn(String alias, Column column)
             case MaterialLSIDPrefix:
             case Name:
             case LabelColor:
-            case MetricUnit:
             case AutoLinkTargetContainer:
             case AutoLinkCategory:
             case RowId:
                 return wrapColumn(alias, _rootTable.getColumn(column.toString()));
+            case MetricUnit:
+            {
+                var columnInfo = wrapColumn(alias, _rootTable.getColumn(column.toString()));
+                columnInfo.setLabel("Display Units");
+                return columnInfo;
+            }
             case Created:
                 return wrapColumn(alias, _rootTable.getColumn("Created"));
             case CreatedBy:
diff --git a/experiment/src/org/labkey/experiment/api/ExpSampleTypeTestCase.jsp b/experiment/src/org/labkey/experiment/api/ExpSampleTypeTestCase.jsp
index e44db7a69d5..035d1407080 100644
--- a/experiment/src/org/labkey/experiment/api/ExpSampleTypeTestCase.jsp
+++ b/experiment/src/org/labkey/experiment/api/ExpSampleTypeTestCase.jsp
@@ -390,7 +390,7 @@ public void idColsSet_nameExpressionNull_hasNameProperty() throws Exception
     errors = new BatchValidationException();
     svc.insertRows(user, c, rows, errors, null, null);
     assertTrue(errors.hasErrors());
-    assertTrue(errors.getMessage().contains("SampleID or Name is required for sample on row 1"));
+    assertTrue(errors.getMessage().contains("SampleID or Name is required for sample"));
 }
 
 // idCols not null, nameExpression not null, 'name' property (not used) -- fail
diff --git a/experiment/src/org/labkey/experiment/api/SampleTypeServiceImpl.java b/experiment/src/org/labkey/experiment/api/SampleTypeServiceImpl.java
index fe5c12767e0..f435673dcbc 100644
--- a/experiment/src/org/labkey/experiment/api/SampleTypeServiceImpl.java
+++ b/experiment/src/org/labkey/experiment/api/SampleTypeServiceImpl.java
@@ -23,6 +23,8 @@
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.junit.Assert;
+import org.junit.Test;
 import org.labkey.api.action.ApiUsageException;
 import org.labkey.api.audit.AbstractAuditHandler;
 import org.labkey.api.audit.AbstractAuditTypeProvider;
@@ -42,6 +44,7 @@
 import org.labkey.api.data.Container;
 import org.labkey.api.data.ContainerFilter;
 import org.labkey.api.data.ContainerManager;
+import org.labkey.api.data.ConversionExceptionWithMessage;
 import org.labkey.api.data.DatabaseCache;
 import org.labkey.api.data.DbSchema;
 import org.labkey.api.data.DbScope;
@@ -94,6 +97,7 @@
 import org.labkey.api.inventory.InventoryService;
 import org.labkey.api.miniprofiler.MiniProfiler;
 import org.labkey.api.miniprofiler.Timing;
+import org.labkey.api.ontology.KindOfQuantity;
 import org.labkey.api.ontology.Quantity;
 import org.labkey.api.ontology.Unit;
 import org.labkey.api.qc.DataState;
@@ -174,6 +178,16 @@ public class SampleTypeServiceImpl extends AbstractAuditHandler implements Sampl
     public static final String SAMPLE_COUNT_SEQ_NAME = "org.labkey.api.exp.api.ExpMaterial:sampleCount";
     public static final String ROOT_SAMPLE_COUNT_SEQ_NAME = "org.labkey.api.exp.api.ExpMaterial:rootSampleCount";
 
+    public static final List<Unit> SUPPORTED_UNITS = new ArrayList<>();
+    public static final String CONVERSION_EXCEPTION_MESSAGE ="Units value (%s) is not compatible with the %s display units (%s).";
+
+    static
+    {
+        SUPPORTED_UNITS.addAll(KindOfQuantity.Volume.getCommonUnits());
+        SUPPORTED_UNITS.addAll(KindOfQuantity.Mass.getCommonUnits());
+        SUPPORTED_UNITS.addAll(KindOfQuantity.Count.getCommonUnits());
+    }
+
     // columns that may appear in a row when only the sample status is updating.
     public static final Set<String> statusUpdateColumns = Set.of(
             ExpMaterialTable.Column.Modified.name().toLowerCase(),
@@ -208,6 +222,44 @@ Cache<String, SortedSet<MaterialSource>> getMaterialSourceCache()
         return materialSourceCache;
     }
 
+    @Override @NotNull
+    public List<Unit> getSupportedUnits()
+    {
+        return SUPPORTED_UNITS;
+    }
+
+    @Nullable @Override
+    public Unit getValidatedUnit(@Nullable Object rawUnits, @Nullable Unit defaultUnits, String sampleTypeName)
+    {
+        if (rawUnits == null)
+            return null;
+        if (rawUnits instanceof Unit u)
+        {
+            if (defaultUnits == null)
+                return u;
+            else if (u.getKindOfQuantity() != defaultUnits.getKindOfQuantity())
+                throw new ConversionExceptionWithMessage(String.format(CONVERSION_EXCEPTION_MESSAGE, rawUnits, sampleTypeName == null ? "" : sampleTypeName, defaultUnits));
+            else
+                return u;
+        }
+        if (!(rawUnits instanceof String rawUnitsString))
+            throw new ConversionExceptionWithMessage(String.format(CONVERSION_EXCEPTION_MESSAGE, rawUnits, sampleTypeName == null ? "" : sampleTypeName, defaultUnits));
+        if (!StringUtils.isBlank(rawUnitsString))
+        {
+            rawUnitsString = rawUnitsString.trim();
+
+            Unit mUnit = Unit.fromName(rawUnitsString);
+            List<Unit> commonUnits = getSupportedUnits();
+            if (mUnit == null || !commonUnits.contains(mUnit))
+            {
+                throw new ConversionExceptionWithMessage("Unsupported Units value (" + rawUnitsString + ").  Supported values are: " + StringUtils.join(commonUnits, ", ") + ".");
+            }
+            if (defaultUnits != null && mUnit.getKindOfQuantity() != defaultUnits.getKindOfQuantity())
+                throw new ConversionExceptionWithMessage(String.format(CONVERSION_EXCEPTION_MESSAGE, rawUnits, sampleTypeName == null ? "" : sampleTypeName, defaultUnits));
+            return mUnit;
+        }
+        return null;
+    }
 
     public void clearMaterialSourceCache(@Nullable Container c)
     {
@@ -2259,4 +2311,60 @@ public void refreshSampleTypeMaterializedView(@NotNull ExpSampleType st, SampleC
     {
         ExpMaterialTableImpl.refreshMaterializedView(st.getLSID(), reason);
     }
+
+
+    public static class TestCase extends Assert
+    {
+        @Test
+        public void testGetValidatedUnit()
+        {
+            SampleTypeService service = SampleTypeService.get();
+            try
+            {
+                service.getValidatedUnit("g", Unit.mg, "Sample Type");
+                service.getValidatedUnit("g ", Unit.mg, "Sample Type");
+                service.getValidatedUnit(" g ", Unit.mg, "Sample Type");
+            }
+            catch (ConversionExceptionWithMessage e)
+            {
+                fail("Compatible unit should not throw exception.");
+            }
+            try
+            {
+                assertNull(service.getValidatedUnit(null, Unit.unit, "Sample Type"));
+            }
+            catch (ConversionExceptionWithMessage e)
+            {
+                fail("null units should be null");
+            }
+            try
+            {
+                assertNull(service.getValidatedUnit("", Unit.unit, "Sample Type"));
+            }
+            catch (ConversionExceptionWithMessage e)
+            {
+                fail("empty units should be null");
+            }
+            try
+            {
+                service.getValidatedUnit("g", Unit.unit, "Sample Type");
+                fail("Units that are not comparable should throw exception.");
+            }
+            catch (ConversionExceptionWithMessage ignore)
+            {
+
+            }
+
+            try
+            {
+                service.getValidatedUnit("nonesuch", Unit.unit, "Sample Type");
+                fail("Invalid units should throw exception.");
+            }
+            catch (ConversionExceptionWithMessage ignore)
+            {
+
+            }
+
+        }
+    }
 }
diff --git a/experiment/src/org/labkey/experiment/api/SampleTypeUpdateServiceDI.java b/experiment/src/org/labkey/experiment/api/SampleTypeUpdateServiceDI.java
index 587a1623a24..4dccc7d4fc1 100644
--- a/experiment/src/org/labkey/experiment/api/SampleTypeUpdateServiceDI.java
+++ b/experiment/src/org/labkey/experiment/api/SampleTypeUpdateServiceDI.java
@@ -148,8 +148,8 @@
 import static org.labkey.api.exp.api.SampleTypeDomainKind.ALIQUOT_ROLLUP_FIELD_LABELS;
 import static org.labkey.api.exp.api.SampleTypeService.ConfigParameters.SkipAliquotRollup;
 import static org.labkey.api.exp.api.SampleTypeService.ConfigParameters.SkipMaxSampleCounterFunction;
-import static org.labkey.api.exp.api.SampleTypeService.MISSING_COLUMN_ERROR_MESSAGE_PATTERN;
-import static org.labkey.api.exp.api.SampleTypeService.MISSING_COLUMN_VALUE_ERROR_MESSAGE_PATTERN;
+import static org.labkey.api.exp.api.SampleTypeService.MISSING_AMOUNT_ERROR_MESSAGE;
+import static org.labkey.api.exp.api.SampleTypeService.MISSING_UNITS_ERROR_MESSAGE;
 import static org.labkey.api.exp.api.SampleTypeService.UNPROVIDED_VALUE_ERROR_MESSAGE_PATTERN;
 import static org.labkey.api.exp.query.ExpMaterialTable.Column.AliquotCount;
 import static org.labkey.api.exp.query.ExpMaterialTable.Column.AliquotVolume;
@@ -534,9 +534,9 @@ public static void confirmAmountAndUnitsColumns(Collection<String> columns, bool
         if (hasUnits == hasAmount)
             return; // both columns are present or neither is
         if (!hasAmount)
-            throw new ConversionExceptionWithMessage(String.format(MISSING_COLUMN_ERROR_MESSAGE_PATTERN, StoredAmount.label(), Units.name()));
+            throw new ConversionExceptionWithMessage(MISSING_AMOUNT_ERROR_MESSAGE);
 
-        throw new ConversionExceptionWithMessage(String.format(MISSING_COLUMN_ERROR_MESSAGE_PATTERN, Units.name(), StoredAmount.label()));
+        throw new ConversionExceptionWithMessage(MISSING_UNITS_ERROR_MESSAGE);
     }
 
     @Override
@@ -665,11 +665,11 @@ protected Map<String, Object> coerceTypes(Map<String, Object> row, Map<String, O
             Object value = entry.getValue();
             if (col != null && col == unitsCol)
             {
-                value = _SamplesCoerceDataIterator.SampleUnitsConvertColumn.getValue(unitsVal, amountVal, amountCol != null, baseUnit);
+                value = _SamplesCoerceDataIterator.SampleUnitsConvertColumn.getValue(unitsVal, amountVal, amountCol != null, baseUnit, _sampleType == null ? null : _sampleType.getName());
             }
             else if (col != null && col == amountCol)
             {
-                value = _SamplesCoerceDataIterator.SampleAmountConvertColumn.getValue(amountVal, unitsCol != null, unitsVal, baseUnit);
+                value = _SamplesCoerceDataIterator.SampleAmountConvertColumn.getValue(amountVal, unitsCol != null, unitsVal, baseUnit, _sampleType == null ? null : _sampleType.getName());
             }
             else if (col != null && value != null &&
                     !col.getJavaObjectClass().isInstance(value) &&
@@ -880,15 +880,15 @@ protected Map<String, Object> _update(User user, Container c, Map<String, Object
         boolean isAliquot = !StringUtils.isEmpty(oldAliquotedFromLSID);
 
         Integer aliquotRollupRoot = null;
-
+        SampleTypeService stService = SampleTypeService.get();
         if (!_sampleType.isMedia() && isAliquot)
         {
             Integer aliquotRoot = (Integer) oldRow.get(RootMaterialRowId.name());
 
             if (row.containsKey(StoredAmount.name()) || row.containsKey(Units.name()))
             {
-                Unit oldRowUnits = Unit.getValidatedUnit(oldRow.get(Units.name()), _sampleType.getBaseUnit());
-                Unit rowUnits = Unit.getValidatedUnit(row.get(Units.name()), _sampleType.getBaseUnit());
+                Unit oldRowUnits = stService.getValidatedUnit(oldRow.get(Units.name()), _sampleType.getBaseUnit(), _sampleType.getName());
+                Unit rowUnits = stService.getValidatedUnit(row.get(Units.name()), _sampleType.getBaseUnit(), _sampleType.getName());
                 Quantity oldQuantity = null;
                 Quantity newQuantity = null;
                 if (oldRowUnits != null && oldRow.get(StoredAmount.name()) != null)
@@ -1840,14 +1840,15 @@ else if (aliquotedFromObj instanceof Number)
             catch (NameGenerator.NameGenerationException e)
             {
                 // Failed to generate a name due to some part of the expression not in the row
+                String rowText = _context.isCrossFolderImport() || _context.isCrossTypeImport() ? "" : " on row " + e.getRowNumber();
                 if (isAliquot)
-                    addRowError("Failed to generate name for aliquot on row " + e.getRowNumber() + " using aliquot naming pattern " + _sampleType.getAliquotNameExpression() + ". Check the syntax of the aliquot naming pattern and the data values for the aliquot.");
+                    addRowError("Failed to generate name for aliquot " + rowText + " using aliquot naming pattern " + _sampleType.getAliquotNameExpression() + ". Check the syntax of the aliquot naming pattern and the data values for the aliquot.");
                 else if (_sampleType.hasNameExpression())
-                    addRowError("Failed to generate name for sample on row " + e.getRowNumber() + " using naming pattern " + _sampleType.getNameExpression() + ". Check the syntax of the naming pattern and the data values for the sample.");
+                    addRowError("Failed to generate name for sample " + rowText + " using naming pattern " + _sampleType.getNameExpression() + ". Check the syntax of the naming pattern and the data values for the sample.");
                 else if (_sampleType.hasNameAsIdCol())
-                    addRowError("SampleID or Name is required for sample on row " + e.getRowNumber());
+                    addRowError("SampleID or Name is required for sample " + rowText + ".");
                 else
-                    addRowError("All id columns are required for sample on row " + e.getRowNumber());
+                    addRowError("All id columns are required for sample " + rowText + ".");
             }
         }
 
@@ -2048,7 +2049,7 @@ public SampleUnitsConvertColumn(String fieldName, int indexFrom, @Nullable JdbcT
             }
 
             // This should return the base unit if we have one for the sample type since we are storing all data in the base unit
-            public static Object getValue(Object o, Object amountObj, boolean haveAmountCol, Unit baseUnit)
+            public static Object getValue(Object o, Object amountObj, boolean haveAmountCol, Unit baseUnit, String sampleTypeName)
             {
                 if (o == null || ((o instanceof String) && ((String) o).isEmpty()))
                 {
@@ -2057,14 +2058,14 @@ public static Object getValue(Object o, Object amountObj, boolean haveAmountCol,
 
                 // when there's a units value but no amount column, this is an error
                 if (!haveAmountCol)
-                    throw new ConversionExceptionWithMessage(String.format(MISSING_COLUMN_VALUE_ERROR_MESSAGE_PATTERN, StoredAmount.label(), Units.name()));
+                    throw new ConversionExceptionWithMessage(MISSING_AMOUNT_ERROR_MESSAGE);
 
                 // When an amount column is present but no amount value is provided, this is an error
                 if (amountObj == null || ((amountObj instanceof String) && ((String) amountObj).isEmpty()))
                     throw new ConversionExceptionWithMessage(String.format(UNPROVIDED_VALUE_ERROR_MESSAGE_PATTERN,  StoredAmount.label(), Units.name(), o));
 
 
-                Unit validatedUnit = Unit.getValidatedUnit(o, baseUnit);
+                Unit validatedUnit = SampleTypeService.get().getValidatedUnit(o, baseUnit, sampleTypeName);
                 // if there's a base unit, return the base unit name otherwise return the name of the given unit
                 return validatedUnit == null ? null : baseUnit != null ? baseUnit.name() : validatedUnit.name();
             }
@@ -2072,7 +2073,7 @@ public static Object getValue(Object o, Object amountObj, boolean haveAmountCol,
             @Override
             protected Object convert(Object o)
             {
-                return getValue(o, _storedAmountColInd == -1 ? null : _data.get(_storedAmountColInd), _storedAmountColInd != -1, _sampleTypeBaseUnit);
+                return getValue(o, _storedAmountColInd == -1 ? null : _data.get(_storedAmountColInd), _storedAmountColInd != -1, _sampleTypeBaseUnit, _sampleType.getName());
             }
         }
 
@@ -2087,14 +2088,14 @@ public SampleAmountConvertColumn(String fieldName, int indexFrom, @Nullable Jdbc
             }
 
             // This should return a Number in the base units of the sample type.
-            public static Object getValue(Object amountObj, boolean hasUnitsCol, Object unitsObj, Unit displayUnit)
+            public static Object getValue(Object amountObj, boolean hasUnitsCol, Object unitsObj, Unit displayUnit, @Nullable String sampleTypeName)
             {
                 if (amountObj == null || ((amountObj instanceof String) && ((String) amountObj).trim().isEmpty()))
                     return null;
 
                 // When there is an amount value, if there isn't a units column, this is an error.
                 if (!hasUnitsCol)
-                    throw new ConversionExceptionWithMessage(String.format(MISSING_COLUMN_VALUE_ERROR_MESSAGE_PATTERN, Units.name(), StoredAmount.label()));
+                    throw new ConversionExceptionWithMessage(MISSING_UNITS_ERROR_MESSAGE);
 
                 // Have a units column, but no units value
                 if (unitsObj == null || ((unitsObj instanceof String) && ((String) unitsObj).trim().isEmpty()))
@@ -2104,7 +2105,7 @@ public static Object getValue(Object amountObj, boolean hasUnitsCol, Object unit
                     throw new ConversionExceptionWithMessage(String.format(UNPROVIDED_VALUE_ERROR_MESSAGE_PATTERN , Units.name(), StoredAmount.label(), amountObj));
                 }
 
-                Unit unit = Unit.getValidatedUnit(unitsObj, displayUnit);
+                Unit unit = SampleTypeService.get().getValidatedUnit(unitsObj, displayUnit, sampleTypeName);
 
                 // Should always be non-null at this point.
                 if (unit != null && displayUnit != null)
@@ -2129,7 +2130,7 @@ else if (amountObj instanceof String amountStr)
             @Override
             protected Object convert(Object amountObj)
             {
-                return getValue(amountObj, _unitsColInd != -1, _unitsColInd == -1 ? null : _data.get(_unitsColInd), _sampleTypeBaseUnit);
+                return getValue(amountObj, _unitsColInd != -1, _unitsColInd == -1 ? null : _data.get(_unitsColInd), _sampleTypeBaseUnit, _sampleType.getName());
             }
         }