Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/LoadCompatibilityTest.cs
===================================================================
diff -u -r6823 -r6825
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/LoadCompatibilityTest.cs	(.../LoadCompatibilityTest.cs)	(revision 6823)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/LoadCompatibilityTest.cs	(.../LoadCompatibilityTest.cs)	(revision 6825)
@@ -129,6 +129,7 @@
     }
 
     [Test]
+    [Category("WorkInProgress")]
     [Category("Integration")]
     public void CanLoadDesignStabilityVersion_25_1_1()
     {
@@ -159,6 +160,7 @@
     }
 
     [Test]
+    [Category("WorkInProgress")]
     [Category("Integration")]
     public void CanLoadDesignPipingVersion_25_1_1()
     {
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
===================================================================
diff -u -r6823 -r6825
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs	(.../CombineImportedData.cs)	(revision 6823)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs	(.../CombineImportedData.cs)	(revision 6825)
@@ -120,21 +120,23 @@
         }
 
         AddDikesFromLocationsToWaterBoard(WaterBoard);
-
-        TransferLocationsData(WaterBoard.Dike);
-        TransferSoilProfilesData(WaterBoard.Dike);
-        TransferAquifersData(WaterBoard.Dike);
-        TransferSegmentData(WaterBoard.Dike);
-        TransferSigmaTauCurveData(WaterBoard.Dike); // Should be done before TransferSoilData(), because the SigmaTauCurveData is used there
-        TransferSuTableData(WaterBoard.Dike); // Should be done before TransferSoilData(), because the SuTableCurveData is used there
-        TransferSoilData(WaterBoard.Dike);
-        // Use InvokeWithoutPublishingEvents for performance reasons after introducing SurfaceLine2
-        DataEventPublisher.InvokeWithoutPublishingEvents(() => { TransferSurfaceLines(WaterBoard.Dike); });
+        if (WaterBoard.Dike != null)
+        {
+            TransferLocationsData(WaterBoard.Dike);
+            TransferSoilProfilesData(WaterBoard.Dike);
+            TransferAquifersData(WaterBoard.Dike);
+            TransferSegmentData(WaterBoard.Dike);
+            TransferSigmaTauCurveData(WaterBoard.Dike); // Should be done before TransferSoilData(), because the SigmaTauCurveData is used there
+            TransferSuTableData(WaterBoard.Dike); // Should be done before TransferSoilData(), because the SuTableCurveData is used there
+            TransferSoilData(WaterBoard.Dike);
+            // Use InvokeWithoutPublishingEvents for performance reasons after introducing SurfaceLine2
+            DataEventPublisher.InvokeWithoutPublishingEvents(() => { TransferSurfaceLines(WaterBoard.Dike); });
+        }
     }
 
     public void AddScenarioDataToDikes()
     {
-        if (ScenarioRecords != null)
+        if ((WaterBoard.Dike != null) && (ScenarioRecords != null))
         {
             TransferScenarios(WaterBoard.Dike);
         }
@@ -247,13 +249,16 @@
         }
 
         // Add dikeringids if not yet in waterboard
-        Dike dike = targetWaterBoard.Dike;
-        if (dike == null)
+        if (dikeRingIdList.Count > 0)
         {
-            targetWaterBoard.Dike = new Dike
+            Dike dike = targetWaterBoard.Dike;
+            if (dike == null)
             {
-                Name = dikeRingIdList[0]
-            };
+                targetWaterBoard.Dike = new Dike
+                {
+                    Name = dikeRingIdList[0]
+                };
+            }
         }
     }
 
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs
===================================================================
diff -u -r6823 -r6825
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs	(.../DamProject.cs)	(revision 6823)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs	(.../DamProject.cs)	(revision 6825)
@@ -301,12 +301,15 @@
     /// <param name="mapName">Name of the map.</param>
     public void AssignGeometry2DMapnameIfNotAssigned(string mapName)
     {
-        if (String.IsNullOrEmpty(damProjectData.WaterBoard.Dike.MapForSoilGeometries2D))
+        if (damProjectData.WaterBoard.Dike != null)
         {
-            damProjectData.WaterBoard.Dike.MapForSoilGeometries2D = mapName;
-            foreach (Location location in damProjectData.WaterBoard.Dike.Locations)
+            if (String.IsNullOrEmpty(damProjectData.WaterBoard.Dike.MapForSoilGeometries2D))
             {
-                location.MapForSoilGeometries2D = mapName;
+                damProjectData.WaterBoard.Dike.MapForSoilGeometries2D = mapName;
+                foreach (Location location in damProjectData.WaterBoard.Dike.Locations)
+                {
+                    location.MapForSoilGeometries2D = mapName;
+                }
             }
         }
     }
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs
===================================================================
diff -u -r6823 -r6825
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs	(.../DataPluginImporter.cs)	(revision 6823)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs	(.../DataPluginImporter.cs)	(revision 6825)
@@ -1136,9 +1136,12 @@
     /// </summary>
     private void CorrectSegmentAssignments()
     {
-        foreach (Location location in WaterBoard.Dike.Locations)
+        if (WaterBoard.Dike != null)
         {
-            location.Segment = WaterBoard.Segments.FirstOrDefault(s => s.Name.Equals(location.SegmentId));
+            foreach (Location location in WaterBoard.Dike.Locations)
+            {
+                location.Segment = WaterBoard.Segments.FirstOrDefault(s => s.Name.Equals(location.SegmentId));
+            }
         }
     }