diff --git a/experiment/src/org/labkey/experiment/ExpDataIterators.java b/experiment/src/org/labkey/experiment/ExpDataIterators.java
index 1d7707ed0a1..841ce6bf8d2 100644
--- a/experiment/src/org/labkey/experiment/ExpDataIterators.java
+++ b/experiment/src/org/labkey/experiment/ExpDataIterators.java
@@ -1933,7 +1933,7 @@ else if (aliasPrefix != null && aliasSuffix != null)
                         if (sample != null)
                             parentMaterials.put(sample, sampleRole(sample));
                         else
-                            throw new ValidationException("Sample '" + entityName + "' not found in Sample Type '" + namePart + "'.");
+                            throw new ValidationException("Parent sample '" + entityName + "' from Sample Type '" + namePart + "' not found in the current context.");
 
                     }
                 }
@@ -2002,9 +2002,9 @@ else if (DATA_INPUT_PARENT.equalsIgnoreCase(aliasPrefix))
                         {
 
                             if (ExpSchema.DataClassCategoryType.sources.name().equalsIgnoreCase(dataClass.getCategory()))
-                                throw new ValidationException("Source '" + entityName + "' not found in Source Type  '" + namePart + "'.");
+                                throw new ValidationException("Source '" + entityName + "' from Source Type '" + namePart + "' not found in the current context.");
                             else
-                                throw new ValidationException("Data input '" + entityName + "' not found in Data Class '" + namePart + "'.");
+                                throw new ValidationException("Data input '" + entityName + "' from Data Class '" + namePart + "' not found in the current context.");
                         }
                     }
                 }