Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Assemblers/CalculationParametersAssembler.cs
===================================================================
diff -u -r3265 -r3273
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Assemblers/CalculationParametersAssembler.cs	(.../CalculationParametersAssembler.cs)	(revision 3265)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Assemblers/CalculationParametersAssembler.cs	(.../CalculationParametersAssembler.cs)	(revision 3273)
@@ -97,6 +97,14 @@
         {
         }
 
+        /// <summary>
+        /// Gets or sets the name of the file.
+        /// </summary>
+        /// <value>
+        /// The name of the file.
+        /// </value>
+        public string FileName { get; set; }
+
         public override CalculationParameters CreateDomainObject(XElement dtoObj)
         {
 
@@ -107,9 +115,8 @@
             if (calculationModulesElement != null)
             {
                 CalculationModules calculationModules = new CalculationModules();
-
-                XElement element = calculationModulesElement.Element(CalculationParametersAssembler.XmlStabilityInsideElementName);
                 var found = false;
+                XElement element = calculationModulesElement.Element(CalculationParametersAssembler.XmlStabilityInsideElementName);
                 if (element != null)
                 {
                     calculationModules.StabilityInside = int.Parse(element.Value) != 0;
@@ -119,6 +126,7 @@
                 if (element != null && !found)
                 {
                     calculationModules.StabilityInside = int.Parse(element.Value) != 0;
+                    found = true;
                 }
                 element = calculationModulesElement.Element(CalculationParametersAssembler.XmlStabilityOutsideElementName);
                 if (element != null)
@@ -145,10 +153,9 @@
                 }
 
                 // Check for obsolete keys
-                //ThrowIfObsoleteKeyNameFound(calculationModulesElement, XmlObsoleteStabilityElementName);
-                ThrowIfObsoleteKeyNameFound(calculationModulesElement, XmlObsoletePipingSellmeijerProbabilisticElementName);
-                ThrowIfObsoleteKeyNameFound(calculationModulesElement, XmlObsoletePipingIJkdijkElementName);
-                ThrowIfObsoleteKeyNameFound(calculationModulesElement, XmlObsoleteOvertoppingElementName);
+                ThrowIfObsoleteKeyNameFound(calculationModulesElement, XmlObsoletePipingSellmeijerProbabilisticElementName, FileName);
+                ThrowIfObsoleteKeyNameFound(calculationModulesElement, XmlObsoletePipingIJkdijkElementName, FileName);
+                ThrowIfObsoleteKeyNameFound(calculationModulesElement, XmlObsoleteOvertoppingElementName, FileName);
                 
 
                 calculationParameters.CalculationModules = calculationModules;
@@ -190,23 +197,23 @@
                 }
 
                 // Check for obsolete keys
-                ThrowIfObsoleteKeyNameFound(mstabParametersElement, XmlObsoleteMStabProbabilisticElementName);
-                ThrowIfObsoleteKeyNameFound(mstabParametersElement, XmlObsoleteMStabIsOverrulePLLineCreationMethodName);
-                ThrowIfObsoleteKeyNameFound(mstabParametersElement, XmlObsoleteMStabPLLineCreationMethodname);
-                ThrowIfObsoleteKeyNameFound(mstabParametersElement, XmlObsoleteMStabShearStrengthElementName);
+                ThrowIfObsoleteKeyNameFound(mstabParametersElement, XmlObsoleteMStabProbabilisticElementName, FileName);
+                ThrowIfObsoleteKeyNameFound(mstabParametersElement, XmlObsoleteMStabIsOverrulePLLineCreationMethodName, FileName);
+                ThrowIfObsoleteKeyNameFound(mstabParametersElement, XmlObsoleteMStabPLLineCreationMethodname, FileName);
+                ThrowIfObsoleteKeyNameFound(mstabParametersElement, XmlObsoleteMStabShearStrengthElementName, FileName);
 
                 calculationParameters.MStabParameters = mstabParameters;
             }
 
             return calculationParameters;
         }
 
-        private static void ThrowIfObsoleteKeyNameFound(XElement calculationModulesElement, string obsoleteElementKeyName)
+        private static void ThrowIfObsoleteKeyNameFound(XElement calculationModulesElement, string obsoleteElementKeyName, string fileName)
         {
             XElement obsoleteElement = calculationModulesElement.Element(obsoleteElementKeyName);
             if (obsoleteElement != null)
             {
-                throw new DtoAssemblerException(String.Format("The specified parameter '{0}' is obsolete", obsoleteElementKeyName));
+                throw new DtoAssemblerException(String.Format("Your input file {0} is incorrect. The specified parameter '{1}' in your xml is obsolete. Please remove it.", fileName, obsoleteElementKeyName));
             }
         }