Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.StixFileReader/SoilProfile2DDataModel.cs
===================================================================
diff -u -r4254 -r4284
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.StixFileReader/SoilProfile2DDataModel.cs	(.../SoilProfile2DDataModel.cs)	(revision 4254)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.StixFileReader/SoilProfile2DDataModel.cs	(.../SoilProfile2DDataModel.cs)	(revision 4284)
@@ -49,7 +49,7 @@
         foreach (PersistableLayer layer in geometry.Layers)
         {
             CreateCurvesFromLayer(layer, soilProfile2D.Geometry.Curves);
-            CreateSurfacesFromLayer(layer, soilProfile2D.Geometry.Surfaces);
+            var surface = CreateSurfacesFromLayer(layer, soilProfile2D.Geometry.Surfaces);
             foreach (PersistablePoint point in layer.Points)
             {
                 if (!IsPointPresent(point, soilProfile2D.Geometry.Points))
@@ -58,21 +58,25 @@
                 }
             }
             
-            soilProfile2D.Geometry.RegenerateGeometry();
-
             PersistableSoil persistableSoil = FetchSoilProperties(layer.Id, dataModel);
 
+            var soil = new Soil();
+            if (persistableSoil != null)
+            {
+                soil.Name = persistableSoil.Name;
+                soil.Color = FetchSoilColor(persistableSoil, dataModel);
+            }
+            
             var soilLayer2D = new SoilLayer2D
             {
-                Soil = new Soil
-                {
-                    Name = persistableSoil.Name,
-                    Color = FetchSoilColor(persistableSoil, dataModel)
-                }
+                Soil = soil,
+                GeometrySurface = surface
             };
             soilProfile2D.Surfaces.Add(soilLayer2D);
         }
 
+        soilProfile2D.Geometry.RegenerateGeometry();
+
         return soilProfile2D;
     }
 
@@ -109,7 +113,7 @@
         return soilId == string.Empty ? null : dataModel.Soils.Soils.FirstOrDefault(soil => soil.Id == soilId);
     }
 
-    private void CreateSurfacesFromLayer(PersistableLayer layer, ICollection<GeometrySurface> geometrySurface)
+    private GeometrySurface CreateSurfacesFromLayer(PersistableLayer layer, ICollection<GeometrySurface> geometrySurface)
     {
         var surface = new GeometrySurface();
         for (var i = 0; i < layer.Points.Count(); i++)
@@ -120,6 +124,8 @@
 
         //To Do: Add inner loops
         geometrySurface.Add(surface);
+
+        return surface;
     }
 
     private void CreateCurvesFromLayer(PersistableLayer layer, ICollection<GeometryCurve> geometryCurves)