Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
===================================================================
diff -u -r992 -r1113
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs	(.../FillXmlInputFromDam.cs)	(revision 992)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs	(.../FillXmlInputFromDam.cs)	(revision 1113)
@@ -51,7 +51,8 @@
             Input input = new Input();
             input.ProjectPath = damProjectData.ProjectPath;
             input.CalculationMap = damProjectData.CalculationMap;
-
+            input.MaxCalculationCoresSpecified = true;
+            input.MaxCalculationCores = damProjectData.MaxCalculationCores;
             TransferAnalysisSpecification(damProjectData, input);
             TransferStabilityParameters(damProjectData, input);
 
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs
===================================================================
diff -u -r1060 -r1113
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs	(.../FillDamFromXmlInputTests.cs)	(revision 1060)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs	(.../FillDamFromXmlInputTests.cs)	(revision 1113)
@@ -96,6 +96,7 @@
             var damProjectData = new DamProjectData();
             damProjectData.ProjectPath = @"D:\TestDir";
             damProjectData.CalculationMap = @"Sub\Calc";
+            damProjectData.MaxCalculationCores = 3;
 
             FillAnalysisSpecification(damProjectData);
             FillStabilityParameters(damProjectData);
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs
===================================================================
diff -u -r1065 -r1113
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs	(.../DamProjectData.cs)	(revision 1065)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs	(.../DamProjectData.cs)	(revision 1113)
@@ -58,6 +58,7 @@
         private SensorData sensorData;
         private string calculationMap = "";
         private string projectPath = "";
+        private int maxCalculationCores = 1;
 
         /// <summary>
         /// Constructor
@@ -451,6 +452,23 @@
         }
 
         /// <summary>
+        /// Gets or sets the maximum calculation cores.
+        /// </summary>
+        /// <value>
+        /// The maximum calculation cores.
+        /// </value>
+        public int MaxCalculationCores {
+            get
+            {
+                return maxCalculationCores;
+            }
+            set
+            {
+                maxCalculationCores = value;
+            }
+        }
+
+        /// <summary>
         /// Gets or sets the sensor data.
         /// </summary>
         /// <value>
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
===================================================================
diff -u -r992 -r1113
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../FillDamFromXmlInput.cs)	(revision 992)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../FillDamFromXmlInput.cs)	(revision 1113)
@@ -59,7 +59,10 @@
 
             damProjectData.ProjectPath = input.ProjectPath;
             damProjectData.CalculationMap = input.CalculationMap;
-
+            if (input.MaxCalculationCoresSpecified)
+            {
+                damProjectData.MaxCalculationCores = input.MaxCalculationCores;
+            }
             TransferAnalysisSpecification(input, damProjectData);
             TransferStabilityParameters(input, damProjectData);
 
@@ -393,7 +396,11 @@
 
                 SurfaceLine2 surfaceLine = dikeSurfaceLines.First(n => n.Name.Equals(inputLocation.SurfaceLineName));
                 location.SurfaceLine = surfaceLine;
-                Segment segment = segments.First(s => s.Name.Equals(inputLocation.SegmentName));
+                Segment segment = null;
+                if (segments.Count > 0)
+                {
+                    segment = segments.First(s => s.Name.Equals(inputLocation.SegmentName));
+                }
                 location.Segment = segment;
 
                 if (inputLocation.DesignScenarios != null)