Index: DamClients/DamUI/branches/DamUI 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs
===================================================================
diff -u -r3600 -r3601
--- DamClients/DamUI/branches/DamUI 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs	(.../FillDamUiFromXmlOutput.cs)	(revision 3600)
+++ DamClients/DamUI/branches/DamUI 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs	(.../FillDamUiFromXmlOutput.cs)	(revision 3601)
@@ -239,11 +239,10 @@
 
             if (string.IsNullOrEmpty(desResult.CalculationSubDir))
             {
-                var calculationSubDir = DamProject.ProjectMapWorkingPath;
-                calculationSubDir = Path.Combine(calculationSubDir, "Piping");
-                calculationSubDir = Path.Combine(calculationSubDir, desResult.PipingModel.ToString());
-                desResult.CalculationSubDir = calculationSubDir;
+                desResult.CalculationSubDir = Path.Combine("Piping", desResult.PipingModel.ToString());
             }
+            var fullPath = DamProject.ProjectMapWorkingPath;
+            fullPath = Path.Combine(fullPath, desResult.CalculationSubDir);
             if (string.IsNullOrEmpty(desResult.BaseFileName))
             {
                 desResult.BaseFileName = "Loc(" + designResult.LocationName + ")_Prof(" + designResult.ProfileName + ")_Scen(" + designResult.ScenarioName + ")";
Index: DamClients/DamUI/branches/DamUI 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs
===================================================================
diff -u -r3600 -r3601
--- DamClients/DamUI/branches/DamUI 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs	(.../CsvExportData.cs)	(revision 3600)
+++ DamClients/DamUI/branches/DamUI 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs	(.../CsvExportData.cs)	(revision 3601)
@@ -296,15 +296,12 @@
                 if (!String.IsNullOrEmpty(BaseFileName))
                 {
                     const string pipingResultFileExtension = ".prxml";
-                    string fullFilename = calculationSubDir;
+                    string fullFilename = DamProject.ProjectWorkingPath;
                     if (string.IsNullOrEmpty(CalculationSubDir))
                     {
-                        fullFilename = DamProject.ProjectWorkingPath;
-                        fullFilename = Path.Combine(fullFilename, "Piping");
-                        fullFilename = Path.Combine(fullFilename, PipingModel.ToString());
-                        calculationSubDir = fullFilename;
+                        CalculationSubDir = Path.Combine("Piping", PipingModel.ToString());
                     }
-
+                    fullFilename = Path.Combine(fullFilename, CalculationSubDir);
                     fullFilename = fullFilename + Path.DirectorySeparatorChar + BaseFileName;
                     fullFilename = fullFilename + pipingResultFileExtension;
                     return fullFilename;
@@ -1844,8 +1841,8 @@
         {
             get
             {
-                if (soilProfile == null && File.Exists(PipingResultFile) && 
-                    damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping)
+                if (soilProfile == null && damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping && 
+                    File.Exists(PipingResultFile))
                 {
                     if (soilProfileWithSurfaceLine == null)
                     {
@@ -1911,8 +1908,8 @@
         {
             get
             {
-                if (redesignedSurfaceLine == null && File.Exists(PipingResultFile) && 
-                    damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping)
+                if (redesignedSurfaceLine == null && damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping && 
+                    File.Exists(PipingResultFile))
                 {
                     if (soilProfileWithSurfaceLine == null)
                     {
@@ -2369,7 +2366,6 @@
         }
 
         [Browsable(false)]
-        [XmlIgnore]
         public string CalculationSubDir
         {
             get { return calculationSubDir; }
@@ -2426,9 +2422,10 @@
 
         public void CreatePipingResultsFileForSurfaceLineAndProfile(CsvExportData desResult)
         {
-            if (!Directory.Exists(CalculationSubDir))
+            var fullpath = Path.Combine(DamProject.ProjectMapWorkingPath, CalculationSubDir);
+            if (!Directory.Exists(fullpath))
             {
-                Directory.CreateDirectory(CalculationSubDir);
+                Directory.CreateDirectory(fullpath);
             }
             
             var soilProfileWithSurfaceLine = new CsvExportSoilProfileWithSurfaceLine