Index: DamClients/DamUI/branches/DamUI 19.1/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs
===================================================================
diff -u -r3585 -r3589
--- DamClients/DamUI/branches/DamUI 19.1/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs	(.../FillDamUiFromXmlOutput.cs)	(revision 3585)
+++ DamClients/DamUI/branches/DamUI 19.1/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs	(.../FillDamUiFromXmlOutput.cs)	(revision 3589)
@@ -218,13 +218,24 @@
             {
                 var uplift = designResult.PipingDesignResults.UpliftSituation;
                 desResult.IsUplift = uplift.IsUplift;
-                desResult.Pl3MinUplift = uplift.Pl3MinUplift;
-                desResult.Pl3HeadAdjusted = uplift.Pl3HeadAdjusted;
-                desResult.Pl3LocalLocationXMinUplift = uplift.Pl3LocationXMinUplift;
-                desResult.Pl4MinUplift = uplift.Pl4MinUplift;
-                desResult.Pl4HeadAdjusted = uplift.Pl4HeadAdjusted;
-                desResult.Pl4LocalLocationXMinUplift = uplift.Pl4LocationXMinUplift;
+                if (desResult.IsUplift != null && desResult.IsUplift.Value)
+                {
+                    desResult.Pl3MinUplift = uplift.Pl3MinUplift;
+                    desResult.Pl3HeadAdjusted = uplift.Pl3HeadAdjusted;
+                    desResult.Pl3LocalLocationXMinUplift = uplift.Pl3LocationXMinUplift;
+                    desResult.Pl4MinUplift = uplift.Pl4MinUplift;
+                    desResult.Pl4HeadAdjusted = uplift.Pl4HeadAdjusted;
+                    desResult.Pl4LocalLocationXMinUplift = uplift.Pl4LocationXMinUplift;
+                }
+                else
+                {
+                    ResetUpliftValues(desResult);
+                }
             }
+            else
+            {
+                ResetUpliftValues(desResult);
+            }
 
             if (string.IsNullOrEmpty(desResult.CalculationSubDir))
             {
@@ -322,13 +333,34 @@
             {
                 var uplift = designResult.StabilityDesignResults.UpliftSituation;
                 desResult.IsUplift = uplift.IsUplift;
-                desResult.Pl3MinUplift = uplift.Pl3MinUplift;
-                desResult.Pl3HeadAdjusted = uplift.Pl3HeadAdjusted;
-                desResult.Pl3LocalLocationXMinUplift = uplift.Pl3LocationXMinUplift;
-                desResult.Pl4MinUplift = uplift.Pl4MinUplift;
-                desResult.Pl4HeadAdjusted = uplift.Pl4HeadAdjusted;
-                desResult.Pl4LocalLocationXMinUplift = uplift.Pl4LocationXMinUplift;
+                if (desResult.IsUplift != null && desResult.IsUplift.Value)
+                {
+                    desResult.Pl3MinUplift = uplift.Pl3MinUplift;
+                    desResult.Pl3HeadAdjusted = uplift.Pl3HeadAdjusted;
+                    desResult.Pl3LocalLocationXMinUplift = uplift.Pl3LocationXMinUplift;
+                    desResult.Pl4MinUplift = uplift.Pl4MinUplift;
+                    desResult.Pl4HeadAdjusted = uplift.Pl4HeadAdjusted;
+                    desResult.Pl4LocalLocationXMinUplift = uplift.Pl4LocationXMinUplift;
+                }
+                else
+                {
+                    ResetUpliftValues(desResult);
+                }
             }
-        }        
+            else
+            {
+                ResetUpliftValues(desResult);
+            }
+        }
+
+        private static void ResetUpliftValues(CsvExportData desResult)
+        {
+            desResult.Pl3MinUplift = null;
+            desResult.Pl3HeadAdjusted = null;
+            desResult.Pl3LocalLocationXMinUplift = null;
+            desResult.Pl4MinUplift = null;
+            desResult.Pl4HeadAdjusted = null;
+            desResult.Pl4LocalLocationXMinUplift = null;
+        }
     }
 }