Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs
===================================================================
diff -u -r3899 -r3920
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs	(.../FillDamUiFromXmlOutput.cs)	(revision 3899)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs	(.../FillDamUiFromXmlOutput.cs)	(revision 3920)
@@ -47,29 +47,28 @@
         /// <returns></returns>
         public static DamProjectData AddOutputToDamProjectData(DamProjectData damProjectData, Output output)
         {
-            if (output != null && output.Results != null && output.Results.CalculationResults != null)
+            if (output?.Results?.CalculationResults != null)
             {
-                if (output.Results.CalculationResults != null)
-                {
-                    DataEventPublisher.InvokeWithoutPublishingEvents(() =>
-                        {
-                            CreateDesignResultsFromOutput(output, damProjectData);
-                        }
-                    );
-                }                
+                DataEventPublisher.InvokeWithoutPublishingEvents(() =>
+                    {
+                        CreateDesignResultsFromOutput(output, damProjectData);
+                    }
+                );
             }
 
             // Transfer calculation messages
-            if (output != null && output.Results != null && output.Results.CalculationMessages != null)
+            if (output?.Results?.CalculationMessages != null)
             {
                 damProjectData.CalculationMessages = new List<Standard.Logging.LogMessage>();
                 for (int i = 0; i < output.Results.CalculationMessages.Length; i++)
                 {
                     var validationResult = output.Results.CalculationMessages[i];
-                    var logMessage = new Standard.Logging.LogMessage();
-                    logMessage.MessageType = ConversionHelper.ConvertToMessageType(validationResult.MessageType);
-                    logMessage.Subject = null;
-                    logMessage.Message = validationResult.Message1;
+                    var logMessage = new Standard.Logging.LogMessage
+                    {
+                        MessageType = ConversionHelper.ConvertToMessageType(validationResult.MessageType),
+                        Subject = null,
+                        Message = validationResult.Message1
+                    };
                     damProjectData.CalculationMessages.Add(logMessage);
                 }
             }
@@ -402,11 +401,11 @@
             }
             if (string.IsNullOrEmpty(desResult.CalculationSubDir))
             {
-                throw new NullReferenceException(nameof(desResult.CalculationSubDir) + "is null");
+                throw new NullReferenceException(nameof(desResult.CalculationSubDir) + " is null");
             }
             if (string.IsNullOrEmpty(desResult.BaseFileName))
             {
-                throw new NullReferenceException(nameof(desResult.BaseFileName) + "is null");
+                throw new NullReferenceException(nameof(desResult.BaseFileName) + " is null");
             }
             desResult.CreateResultsFileForSurfaceLineAndProfile(desResult.DesignResultFile);
         }