Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
===================================================================
diff -u -r1632 -r1636
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../FillDamFromXmlInput.cs)	(revision 1632)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../FillDamFromXmlInput.cs)	(revision 1636)
@@ -175,29 +175,32 @@
                 timeSerie.TimeStep.MultiplierSpecified = inputTimeSerie.TimeStep.MultiplierSpecified1;
                 timeSerie.TimeStep.DividerSpecified = inputTimeSerie.TimeStep.DividerSpecified1;
                 timeSerie.TimeStep.Unit = ConversionHelper.ConvertToTimeStepUnit(inputTimeSerie.TimeStep.TimeStepUnit);
-                for (int i = 0; i < inputTimeSerie.Entries.TimeSerieEntry.Length; i++)
+                if (inputTimeSerie.Entries.TimeSerieEntry != null)
                 {
-                    var entry = inputTimeSerie.Entries.TimeSerieEntry[i];
-                    Stochast stochastValue = null;
-                    if (entry.StochastValue != null)
+                    for (int i = 0; i < inputTimeSerie.Entries.TimeSerieEntry.Length; i++)
                     {
-                        stochastValue = new Stochast()
+                        var entry = inputTimeSerie.Entries.TimeSerieEntry[i];
+                        Stochast stochastValue = null;
+                        if (entry.StochastValue != null)
                         {
-                            Distribution = entry.StochastValue.Distribution,
-                            Mean = entry.StochastValue.Mean,
-                            StandardDeviation = entry.StochastValue.StandardDeviation
+                            stochastValue = new Stochast()
+                            {
+                                Distribution = entry.StochastValue.Distribution,
+                                Mean = entry.StochastValue.Mean,
+                                StandardDeviation = entry.StochastValue.StandardDeviation
+                            };
+                        }
+                        TimeSerieEntry timeSerieEntry = new TimeSerieEntry()
+                        {
+                            DateTime = entry.DateTime,
+                            Value = entry.Value,
+                            BasisFileName = entry.BasisFileNameWMF,
+                            Flag = entry.Flagnietechtgebruikt,
+                            RelativeCalculationPathName = entry.RelativeCalculationPathName,
+                            StochastValue = stochastValue
                         };
+                        timeSerie.Entries.Add(timeSerieEntry);
                     }
-                    TimeSerieEntry timeSerieEntry = new TimeSerieEntry()
-                    {
-                        DateTime = entry.DateTime,
-                        Value = entry.Value,
-                        BasisFileName = entry.BasisFileNameWMF,
-                        Flag = entry.Flagnietechtgebruikt,
-                        RelativeCalculationPathName = entry.RelativeCalculationPathName,
-                        StochastValue = stochastValue
-                    };
-                    timeSerie.Entries.Add(timeSerieEntry);
                 }
             }
         }
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
===================================================================
diff -u -r1632 -r1636
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs	(.../FillXmlInputFromDam.cs)	(revision 1632)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs	(.../FillXmlInputFromDam.cs)	(revision 1636)
@@ -99,7 +99,7 @@
         private static void TransferSensorData(SensorData sensorData, InputSensorData inputSensorData)
         {
             // Transfer sensorgroups
-            int sensorGroupIndex = 0; 
+            int sensorGroupIndex = 0;
             inputSensorData.SensorGroups = new Io.XmlInput.SensorGroup[sensorData.SensorGroups.Count];
             foreach (var sensorGroup in sensorData.SensorGroups)
             {
@@ -109,7 +109,7 @@
                 int sensorIdIndex = 0;
                 foreach (var sensor in sensorGroup.SensorArray)
                 {
-                    inputSensorGroup.SensorIds[sensorIdIndex] = new SensorGroupSensorIds() {SensorId = sensor.ID};
+                    inputSensorGroup.SensorIds[sensorIdIndex] = new SensorGroupSensorIds() { SensorId = sensor.ID };
                     sensorIdIndex++;
                 }
                 inputSensorData.SensorGroups[sensorGroupIndex] = inputSensorGroup;
@@ -150,7 +150,7 @@
                 int mappingIndex = 0;
                 foreach (var plLineMapping in sensor.PlLineMappings)
                 {
-                    inputSensor.PlLineMapping[mappingIndex] =  new SensorPlLineMapping() { PLineType = ConversionHelper.ConvertToInputPlLineType(plLineMapping)};
+                    inputSensor.PlLineMapping[mappingIndex] = new SensorPlLineMapping() { PLineType = ConversionHelper.ConvertToInputPlLineType(plLineMapping) };
                     mappingIndex++;
                 }
                 inputSensorData.Sensors[sensorIndex] = inputSensor;
@@ -198,18 +198,18 @@
                             Mean = timestepEntry.StochastValue.Mean,
                             StandardDeviation = timestepEntry.StochastValue.StandardDeviation
                         };
-                        TimeSerieEntriesTimeSerieEntry timeStep = new TimeSerieEntriesTimeSerieEntry()
-                        {
-                            DateTime = timestepEntry.DateTime,
-                            Value = timestepEntry.Value,
-                            BasisFileNameWMF = timestepEntry.BasisFileName,
-                            Flagnietechtgebruikt = timestepEntry.Flag,
-                            RelativeCalculationPathName = timestepEntry.RelativeCalculationPathName,
-                            StochastValue = stochastValue
-                        };
-                        inputTimeSerie.Entries.TimeSerieEntry[timeSerieEntryIndex] = timeStep;
-                        timeSerieEntryIndex++;
                     }
+                    TimeSerieEntriesTimeSerieEntry timeStep = new TimeSerieEntriesTimeSerieEntry()
+                    {
+                        DateTime = timestepEntry.DateTime,
+                        Value = timestepEntry.Value,
+                        BasisFileNameWMF = timestepEntry.BasisFileName,
+                        Flagnietechtgebruikt = timestepEntry.Flag,
+                        RelativeCalculationPathName = timestepEntry.RelativeCalculationPathName,
+                        StochastValue = stochastValue
+                    };
+                    inputTimeSerie.Entries.TimeSerieEntry[timeSerieEntryIndex] = timeStep;
+                    timeSerieEntryIndex++;
                 }
                 operationalInputTimeSeries[timeSerieIndex] = inputTimeSerie;
                 timeSerieIndex++;