Index: dam engine/trunk/src/Deltares.DamEngine.Data/Design/DesignScenario.cs
===================================================================
diff -u -r670 -r686
--- dam engine/trunk/src/Deltares.DamEngine.Data/Design/DesignScenario.cs	(.../DesignScenario.cs)	(revision 670)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/Design/DesignScenario.cs	(.../DesignScenario.cs)	(revision 686)
@@ -36,23 +36,13 @@
 {
 
     /// <summary>
-    /// Does uplift occur or not
+    /// Exception class for DesignScenario
     /// </summary>
-    public struct UpliftSituation
-    {
-        public bool IsUplift;
-        public double Pl3MinUplift;
-        public double Pl3HeadAdjusted;
-        public double Pl3LocationXMinUplift;
-        public double Pl4MinUplift;
-        public double Pl4HeadAdjusted;
-        public double Pl4LocationXMinUplift;
-    }
-
+    /// <seealso cref="System.Exception" />
     [Serializable]
-    public class ScenarioException : Exception
+    public class DesignScenarioException : Exception
     {
-        public ScenarioException(string message) : base(message)
+        public DesignScenarioException(string message) : base(message)
         {
         }
     }
@@ -554,7 +544,7 @@
         {
             if ((defaultUpliftCriterionStability == null) && (ModelFactors.UpliftCriterionStability == null))
             {
-                throw new ScenarioException(String.Format(LocalizationManager.GetTranslatedText(this, "NoUpliftCriterionForStability"), Location.Name, ToString()));
+                throw new DesignScenarioException(String.Format(LocalizationManager.GetTranslatedText(this, "NoUpliftCriterionForStability"), Location.Name, ToString()));
                 
             }
             return (ModelFactors.UpliftCriterionStability == null ? defaultUpliftCriterionStability.Value
@@ -570,7 +560,7 @@
         {
             if ((defaultUpliftCriterionPiping == null) && (ModelFactors.UpliftCriterionPiping == null))
             {
-                throw new ScenarioException(String.Format(LocalizationManager.GetTranslatedText(this, "NoUpliftCriterionForPiping"), Location.Name, ToString()));
+                throw new DesignScenarioException(String.Format(LocalizationManager.GetTranslatedText(this, "NoUpliftCriterionForPiping"), Location.Name, ToString()));
             }
             return (ModelFactors.UpliftCriterionPiping == null ? defaultUpliftCriterionPiping.Value : ModelFactors.UpliftCriterionPiping.Value);
         }
@@ -584,7 +574,7 @@
         {
             if ((defaultRequiredSafetyFactorPiping == null) && (ModelFactors.RequiredSafetyFactorPiping == null))
             {
-                throw new ScenarioException(String.Format(LocalizationManager.GetTranslatedText(this, "NoRequiredSafetyFactorPiping"), Location.Name, ToString()));
+                throw new DesignScenarioException(String.Format(LocalizationManager.GetTranslatedText(this, "NoRequiredSafetyFactorPiping"), Location.Name, ToString()));
             }
             return (ModelFactors.RequiredSafetyFactorPiping == null ? defaultRequiredSafetyFactorPiping.Value : ModelFactors.RequiredSafetyFactorPiping.Value);
         }