diff --git a/api/src/org/labkey/api/data/TableViewForm.java b/api/src/org/labkey/api/data/TableViewForm.java
index 3f82dc0cc88..229525bbda2 100644
--- a/api/src/org/labkey/api/data/TableViewForm.java
+++ b/api/src/org/labkey/api/data/TableViewForm.java
@@ -143,7 +143,7 @@ public void doInsert() throws SQLException
         if (null != _tinfo.getColumn("container"))
             setValueToBind("container", _c.getId());
 
-        Map<String, Object> newMap = Table.insert(_user, _tinfo, getTypedValues());
+        Map<String, Object> newMap = Table.insert(_user, _tinfo, _getTypedValues());
         setTypedValues(newMap, false);
     }
 
@@ -168,7 +168,7 @@ public void doUpdate() throws SQLException
             setValueToBind("container", _c.getId());
 
         Object[] pkVal = getPkVals();
-        Map<String, Object> newMap = Table.update(_user, _tinfo, getTypedValues(), pkVal);
+        Map<String, Object> newMap = Table.update(_user, _tinfo, _getTypedValues(), pkVal);
         setTypedValues(newMap, true);
     }
 
@@ -230,7 +230,7 @@ public void refreshFromDb()
         if (maps.length > 0)
         {
             setTypedValues(maps[0], false);
-            setOldValues(new CaseInsensitiveHashMap<>(getTypedValues()));
+            setOldValues(new CaseInsensitiveHashMap<>(_getTypedValues()));
         }
     }
 
@@ -339,7 +339,7 @@ public Object[] getPkVals()
         {
             String pkName = pkNames.get(i);
             Object pkVal;
-            pkVal = getTypedValues().get(pkName);
+            pkVal = _getTypedValues().get(pkName);
             if (null == pkVal)
             {
                 Object oldValues = getOldValues();
@@ -514,28 +514,28 @@ public boolean isValid()
 
     public Object getTypedValue(String propName)
     {
-        return getTypedValues().get(propName);
+        return _getTypedValues().get(propName);
     }
 
     public Object getTypedValue(ColumnInfo column)
     {
-        return getTypedValues().get(getFormFieldName(column));
+        return _getTypedValues().get(getFormFieldName(column));
     }
 
     public boolean hasTypedValue(String propName)
     {
-        return getTypedValues().containsKey(propName);
+        return _getTypedValues().containsKey(propName);
     }
 
     public boolean hasTypedValue(ColumnInfo column)
     {
-        return getTypedValues().containsKey(getFormFieldName(column));
+        return _getTypedValues().containsKey(getFormFieldName(column));
     }
 
     public void setTypedValue(String propName, Object val)
     {
         // call _populate() if necessary
-        getTypedValues();
+        _getTypedValues();
         _values.put(propName, val);
         // We don't use setValueToBind() here because we want to avoid its side effect of clearing _values
         // To convert or not to convert???
@@ -551,11 +551,19 @@ public void setTypedValue(String propName, Object val)
      * setTypedValues
      */
     public Map<String, Object> getTypedValues()
+    {
+        return Collections.unmodifiableMap(_getTypedValues());
+    }
+
+    private Map<String, Object> _getTypedValues()
     {
         if (null == _values)
+        {
+            // TODO we don't usually enter this code path, but we should still throw if there is a conversion error
+            // or maybe enforce that populateValues() has been called and throw IllegalStateException here?
             populateValues(null);
-
-        return Collections.unmodifiableMap(_values);
+        }
+        return _values;
     }
 
     /**
@@ -580,7 +588,7 @@ else if (includeUntyped && _stringValues.containsKey(getFormFieldName(column)))
             else if (getRequest() instanceof MultipartHttpServletRequest request)
             {
                 String fieldName = getMultiPartFormFieldName(column);
-                Object typedValue = getTypedValues().get(fieldName);
+                Object typedValue = _getTypedValues().get(fieldName);
 
                 if (typedValue != null)
                     values.put(column.getName(), typedValue);
diff --git a/study/src/org/labkey/study/controllers/StudyController.java b/study/src/org/labkey/study/controllers/StudyController.java
index 55aa0fee64b..5b217efb322 100644
--- a/study/src/org/labkey/study/controllers/StudyController.java
+++ b/study/src/org/labkey/study/controllers/StudyController.java
@@ -1757,8 +1757,8 @@ public ApiResponse execute(TableViewForm form, BindException errors) throws Exce
             if (!getContainer().hasPermission(getUser(),AdminPermission.class))
                 throw new UnauthorizedException();
 
+            form.setTypedValue("container", getContainer().getId());
             Map<String,Object> values = form.getTypedValues();
-            values.put("container", getContainer().getId());
 
             TableInfo studyProperties = form.getTable();
             QueryUpdateService qus = studyProperties.getUpdateService();