Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Geometry2DImporter/SoilProfile2DImporter.cs
===================================================================
diff -u -r4936 -r4938
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Geometry2DImporter/SoilProfile2DImporter.cs	(.../SoilProfile2DImporter.cs)	(revision 4936)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Geometry2DImporter/SoilProfile2DImporter.cs	(.../SoilProfile2DImporter.cs)	(revision 4938)
@@ -40,6 +40,7 @@
     /// <param name="soilProfileDirectory">The directory to retrieve the soil profiles from.</param>
     /// <param name="segment">The <see cref="Segment" /> to import the soil profiles for.</param>
     /// <param name="availableSoils">The <see cref="SoilList" /> that contains all the valid soil materials.</param>
+    /// <param name="aquifers">The collection of <see cref="Aquifer"/> that is imported from csv.></param>
     /// <returns>A collection of <see cref="SoilProfile2D" />.</returns>
     /// <exception cref="ArgumentNullException"> Thrown when <paramref name="segment" /> or <paramref name="availableSoils" /> is <c>null</c>.
     /// </exception>
@@ -92,6 +93,7 @@
     /// </summary>
     /// <param name="soilProfileDirectory">The directory to read the <see cref="SoilProfile2D"/> from.</param>
     /// <param name="soilProfileName">The name of the soil profile.</param>
+    /// <param name="aquifers">The collection of <see cref="Aquifer"/> that is imported from csv.></param>
     /// <returns>A <see cref="SoilProfile2D"/>.</returns>
     /// <exception cref="SoilProfileImporterException">Thrown when the soil profile could not be read.</exception>
     private static SoilProfile2D ReadSoilProfile(string soilProfileDirectory, string soilProfileName, IEnumerable<Aquifer> aquifers)
@@ -126,7 +128,7 @@
             {
                 var reader = new StixFileReader.StixFileReader();
                 SoilProfile2D readSoilProfile = reader.ReadSoilProfile(filePath);
-                TransferAquiferData(soilProfileFileName, readSoilProfile.Surfaces, aquifers.ToList());
+                TransferAquiferData(soilProfileFileName, readSoilProfile.Surfaces, aquifers);
                 readSoilProfile.Geometry.RegenerateGeometry();
 
                 return readSoilProfile;
@@ -161,14 +163,19 @@
         }
     }
 
-    private static void TransferAquiferData(string soilProfileFileName, IEnumerable<SoilLayer2D> soilLayers, IList<Aquifer> aquifers)
+    private static void TransferAquiferData(string soilProfileFileName, IEnumerable<SoilLayer2D> soilLayers, IEnumerable<Aquifer> aquifers)
     {
-        foreach (SoilLayer2D layer in soilLayers)
+        if (aquifers != null)
         {
-            Aquifer aquifer = aquifers.FirstOrDefault(a => a.StixFileName == soilProfileFileName && a.LayerName == layer.GeometrySurface.Name);
-            if (aquifer != null)
+            List<Aquifer> aquiferList = aquifers.ToList();
+            foreach (SoilLayer2D layer in soilLayers)
             {
-                layer.IsAquifer = true;
+
+                Aquifer aquifer = aquiferList.FirstOrDefault(a => a.StixFileName == soilProfileFileName && a.LayerName == layer.GeometrySurface.Name);
+                if (aquifer != null)
+                {
+                    layer.IsAquifer = true;
+                }
             }
         }
     }
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
===================================================================
diff -u -r4936 -r4938
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs	(.../FillXmlInputFromDamUi.cs)	(revision 4936)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs	(.../FillXmlInputFromDamUi.cs)	(revision 4938)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -744,6 +745,7 @@
     /// <param name="locationJobs">The collection of <see cref="LocationJob"/> to filter.</param>
     /// <param name="soilProfileDirectory">The directory to retrieve the soil profiles from.</param>
     /// <param name="availableSoils">The <see cref="SoilList"/> containing the available soils.</param>
+    /// <param name="aquifers">The collection of <see cref="Aquifer"/> that is imported from csv.></param>
     /// <param name="containedSoilProfiles">The collection of <see cref="SoilProfile2D"/> that is contained
     /// by the <paramref name="locationJobs"/>.</param>
     /// <returns>A collection of <see cref="LocationJob"/> on which calculations can be performed.</returns>
@@ -804,12 +806,17 @@
     /// <param name="soilProfileDirectory">The directory to retrieve the soil profiles from.</param>
     /// <param name="segment">The <see cref="Segment"/> to retrieve the soil profiles for.</param>
     /// <param name="soils">The <see cref="SoilList"/> containing the available soils.</param>
+    /// <param name="aquifers">The collection of <see cref="Aquifer"/> that is imported from csv.></param>
     /// <returns>An array of <see cref="SoilProfile2D"/>.</returns>
     /// <exception cref="SoilProfileImporterException">Thrown when the soil profiles could not be successfully imported.</exception>
     /// <exception cref="ConversionException">Thrown when the soil profiles could not be successfully converted.</exception>
     private static IEnumerable<SoilProfile2D> GetSoilProfiles(string soilProfileDirectory, Segment segment, SoilList soils, IEnumerable<Aquifer> aquifers)
     {
         IEnumerable<Geotechnics.Soils.SoilProfile2D> importedSoilProfiles = SoilProfile2DImporter.Import(soilProfileDirectory, segment, soils, aquifers);
+        if (importedSoilProfiles == null)
+        {
+            return Enumerable.Empty<SoilProfile2D>();
+        }
         return importedSoilProfiles.Select(XmlSoilProfile2DConverter.Convert).ToArray();
     }
 }
\ No newline at end of file
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs
===================================================================
diff -u -r4936 -r4938
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs	(.../Dike.cs)	(revision 4936)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs	(.../Dike.cs)	(revision 4938)
@@ -57,7 +57,6 @@
     private IList<PL1Line> pl1Lines;
     private SoilList soilList;
     private IList<SoilProfile1D> soilProfiles;
-    private IList<Aquifer> aquifers;
 
     public Dike()
     {
@@ -119,12 +118,8 @@
         set => soilList = value;
     }
 
-    public virtual IList<Aquifer> Aquifers
-    {
-        get => aquifers;
-        set => aquifers = value;
-    }
-    
+    public virtual IList<Aquifer> Aquifers { get; set; }
+
     [Browsable(false)] public virtual IList<Gauge> Gauges { get; set; } = new List<Gauge>();
 
     [Browsable(false)] public virtual IList<GaugePLLine> GaugePLLines { get; set; } = new List<GaugePLLine>();