Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesAssessmentRegional/RegionalScenariosCalculation.cs
===================================================================
diff -u -r1288 -r1324
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesAssessmentRegional/RegionalScenariosCalculation.cs	(.../RegionalScenariosCalculation.cs)	(revision 1288)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesAssessmentRegional/RegionalScenariosCalculation.cs	(.../RegionalScenariosCalculation.cs)	(revision 1324)
@@ -179,7 +179,7 @@
             }
             catch(Exception exception)
             {
-                sendMessageDelegate(new LogMessage(LogMessageType.Warning, null, "Unexpected error:" + exception.Message));
+                SendMessage(new LogMessage(LogMessageType.Warning, null, "Unexpected error:" + exception.Message));
                 throw;
             }
         }
@@ -233,10 +233,7 @@
                     {
                         evaluationJob.FailedEvaluatedLocations.Add(location);
                         var locationHasNoSegment = LocalizationManager.GetTranslatedText(GetType(), "LocationHasNoSegment");
-                        if (sendMessageDelegate != null)
-                        {
-                            sendMessageDelegate(new LogMessage(LogMessageType.Error, location, locationHasNoSegment));
-                        }
+                        SendMessage(new LogMessage(LogMessageType.Error, location, locationHasNoSegment));
                     }
                 }
                 else
@@ -250,9 +247,8 @@
                     if (soilGeometryProbabilities.Count == 0)
                     {
                         evaluationJob.FailedEvaluatedLocations.Add(location);
-                        sendMessageDelegate(
-                            new LogMessage(LogMessageType.Warning, location, string.Format("Location has no soilprofiles: ") +
-                                string.Format("Segment: {0}", location.Segment.Name)));
+                        SendMessage(new LogMessage(LogMessageType.Warning, location, string.Format("Location has no soilprofiles: ") +
+                            string.Format("Segment: {0}", location.Segment.Name)));
 
                     }
                     else
@@ -262,8 +258,9 @@
                             if (soilGeometryProbability.SoilProfileType == SoilProfileType.ProfileType2D || soilGeometryProbability.SoilProfileType == SoilProfileType.ProfileTypeStiFile)
                             {
                                 evaluationJob.FailedEvaluatedLocations.Add(location);
-                                sendMessageDelegate(new LogMessage(LogMessageType.Warning, location, LocalizationManager.GetTranslatedText(this, "Geometry2DNotSupportedInRegionalAssessment") +
-                                                    string.Format("Segment: {0}", location.Segment.Name)));
+                                SendMessage(new LogMessage(LogMessageType.Warning, location, 
+                                    LocalizationManager.GetTranslatedText(this, "Geometry2DNotSupportedInRegionalAssessment") +
+                                    string.Format("Segment: {0}", location.Segment.Name)));
                             }
                             else
                             {
@@ -281,9 +278,9 @@
                                     if (evaluationJob.FailedEvaluatedLocations.IndexOf(location) < 0)
                                     {
                                         evaluationJob.FailedEvaluatedLocations.Add(location);
-                                        sendMessageDelegate(
-                                            new LogMessage(LogMessageType.Warning, location, String.Format("Cannot generate scenarios: {0}", e.Message) +
-                                                           String.Format("Soilprofile: {0}", soilProfile.Name)));
+                                        SendMessage(new LogMessage(LogMessageType.Warning, location, 
+                                            String.Format("Cannot generate scenarios: {0}", e.Message) +
+                                            String.Format("Soilprofile: {0}", soilProfile.Name)));
                                     }
                                 }
                                 if (regionalScenarios != null)
@@ -330,10 +327,7 @@
             catch (Exception e)
             {
                 job.CalculationResult = CalculationResult.UnexpectedError;
-                if (sendMessageDelegate != null)
-                {
-                    sendMessageDelegate(new LogMessage(LogMessageType.Warning, job, String.Format(job.LocationName + " Error: {0}", e.Message)));
-                }
+                SendMessage(new LogMessage(LogMessageType.Warning, job, String.Format(job.LocationName + " Error: {0}", e.Message)));
             }
         }
 
@@ -571,7 +565,7 @@
                 }
             }
 
-            sendMessageDelegate(logMessage);
+            SendMessage(logMessage);
         }
 
         /// <summary>
@@ -643,7 +637,8 @@
                                                                 CalculationResult = CalculationResult.RunFailed,
                                                                 SafetyFactor = double.NaN
                                                             };
-                    sendMessageDelegate(new LogMessage(LogMessageType.Warning, location, String.Format("Error in location {0}: {1}", location.Name, e.Message)));
+                    SendMessage(new LogMessage(LogMessageType.Warning, location, 
+                        String.Format("Error in location {0}: {1}", location.Name, e.Message)));
                 }
             }
 
@@ -690,5 +685,13 @@
                 }
             }
         }
+
+        private void SendMessage(LogMessage logMessage)
+        {
+            if (sendMessageDelegate != null)
+            {
+                sendMessageDelegate(logMessage);
+            }
+        }
     }
 }