Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
===================================================================
diff -u -re7acba10209b18e88bf89d9211f6fc031d0f992e -ra65bc56647a666fad39e7fe48fbce3a5c040dfee
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision e7acba10209b18e88bf89d9211f6fc031d0f992e)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision a65bc56647a666fad39e7fe48fbce3a5c040dfee)
@@ -38,6 +38,7 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
     <Reference Include="System.Data.SQLite, Version=1.0.99.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\System.Data.SQLite.Core.1.0.99.0\lib\net40\System.Data.SQLite.dll</HintPath>
       <Private>True</Private>
@@ -46,9 +47,6 @@
       <HintPath>..\..\..\..\packages\System.Data.SQLite.EF6.1.0.99.0\lib\net40\System.Data.SQLite.EF6.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/IPersistor.cs
===================================================================
diff -u -re7acba10209b18e88bf89d9211f6fc031d0f992e -ra65bc56647a666fad39e7fe48fbce3a5c040dfee
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/IPersistor.cs	(.../IPersistor.cs)	(revision e7acba10209b18e88bf89d9211f6fc031d0f992e)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/IPersistor.cs	(.../IPersistor.cs)	(revision a65bc56647a666fad39e7fe48fbce3a5c040dfee)
@@ -38,7 +38,6 @@
         /// <param name="parentNavigationProperty">Collection where <see cref="TModel"/> objects can be searched and added. Usually, this collection is a navigation property of a <see cref="IDbSet{TEntity}"/>.</param>
         /// <param name="model">The <see cref="TModel"/> to be saved in the storage.</param>
         /// <param name="order">Value used for sorting.</param>
-        //void UpdateModels(ICollection<TEntity> parentNavigationProperty, IEnumerable<TModel> listOfModels);
         void UpdateModel(ICollection<TEntity> parentNavigationProperty, TModel model, int order);
 
         /// <summary>
@@ -48,7 +47,6 @@
         /// <param name="parentNavigationProperty">Collection where <see cref="TEntity"/> objects can be added. Usually, this collection is a navigation property of a <see cref="IDbSet{TEntity}"/>.</param>
         /// <param name="model">The <see cref="TModel"/> to be saved in the storage.</param>
         /// <param name="order">Value used for sorting.</param>
-        //void InsertModels(ICollection<TEntity> parentNavigationProperty, IEnumerable<TModel> listOfModels);
         void InsertModel(ICollection<TEntity> parentNavigationProperty, TModel model, int order);
 
         /// <summary>
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/ProjectEntityPersistor.cs
===================================================================
diff -u -r46f39b6003e678cb2fa3add0365f78f09701cf63 -ra65bc56647a666fad39e7fe48fbce3a5c040dfee
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/ProjectEntityPersistor.cs	(.../ProjectEntityPersistor.cs)	(revision 46f39b6003e678cb2fa3add0365f78f09701cf63)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/ProjectEntityPersistor.cs	(.../ProjectEntityPersistor.cs)	(revision a65bc56647a666fad39e7fe48fbce3a5c040dfee)
@@ -36,7 +36,7 @@
     /// <summary>
     /// Persistor for <see cref="ProjectEntity"/>.
     /// </summary>
-    public class ProjectEntityPersistor // : IPersistor<ProjectEntity, Project>
+    public class ProjectEntityPersistor
     {
         private readonly IRingtoetsEntities dbContext;
         private readonly IDbSet<ProjectEntity> dbSet;
@@ -87,7 +87,9 @@
                 {
                     project.Items.Add(section);
                 }
-
+            }
+            if (entry.DuneAssessmentSectionEntities.Count > 0)
+            {
                 var duneList = duneAssessmentSectionEntityPersistor.LoadModels(entry.DuneAssessmentSectionEntities);
                 foreach (var section in duneList)
                 {
@@ -102,9 +104,7 @@
         /// Insert the <see cref="ProjectEntity"/>, based upon the <paramref name="project"/>, in the sequence.
         /// </summary>
         /// <remarks>Execute <see cref="IRingtoetsEntities.SaveChanges"/> afterwards to update the storage.</remarks>
-        /// <param name="parentNavigationProperty"></param>
         /// <param name="project"><see cref="Project"/> to be inserted in the sequence.</param>
-        /// <param name="order">Value used for sorting (not used in in <see cref="ProjectEntity"/>).</param>
         /// <returns>New instance of <see cref="ProjectEntity"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="project"/> is <c>null</c>.</exception>
         /// <exception cref="NotSupportedException">The parentNavigationProperty is read-only.</exception>
@@ -170,7 +170,6 @@
         /// Removes all entities from <see cref="IRingtoetsEntities.ProjectEntities"/> that are not marked as 'updated'.
         /// </summary>
         /// <param name="parentNavigationProperty">List where <see cref="ProjectEntity"/> objects can be searched. Usually, this collection is a navigation property of a <see cref="IDbSet{TEntity}"/>.</param>
-        /// <returns>Number of entities removed.</returns>
         /// <exception cref="NotSupportedException">Thrown when the <paramref name="parentNavigationProperty"/> is read-only.</exception>
         public void RemoveUnModifiedEntries(ICollection<ProjectEntity> parentNavigationProperty)
         {
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj
===================================================================
diff -u -re7acba10209b18e88bf89d9211f6fc031d0f992e -ra65bc56647a666fad39e7fe48fbce3a5c040dfee
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj	(.../Application.Ringtoets.Storage.Test.csproj)	(revision e7acba10209b18e88bf89d9211f6fc031d0f992e)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj	(.../Application.Ringtoets.Storage.Test.csproj)	(revision a65bc56647a666fad39e7fe48fbce3a5c040dfee)
@@ -46,9 +46,6 @@
     <Reference Include="Fluent">
       <HintPath>..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net40\Fluent.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Windows.Shell">
-      <HintPath>..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net40\Microsoft.Windows.Shell.dll</HintPath>
-    </Reference>
     <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
       <Private>True</Private>
@@ -71,9 +68,6 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net40\System.Windows.Interactivity.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xaml" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/DbContext/DikeAssessmentSectionEntityTest.cs
===================================================================
diff -u -re7acba10209b18e88bf89d9211f6fc031d0f992e -ra65bc56647a666fad39e7fe48fbce3a5c040dfee
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/DbContext/DikeAssessmentSectionEntityTest.cs	(.../DikeAssessmentSectionEntityTest.cs)	(revision e7acba10209b18e88bf89d9211f6fc031d0f992e)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/DbContext/DikeAssessmentSectionEntityTest.cs	(.../DikeAssessmentSectionEntityTest.cs)	(revision a65bc56647a666fad39e7fe48fbce3a5c040dfee)
@@ -28,6 +28,7 @@
             const string someName = "<some name>";
             const int someNorm = 5000;
 
+            // Call
             var dikeAssessmentSectionEntity = new DikeAssessmentSectionEntity
             {
                 ProjectEntityId = expectedParentId,
@@ -36,7 +37,7 @@
                 Norm = someNorm
             };
 
-            // Call & Assert
+            // Assert
             Assert.AreEqual(expectedParentId, dikeAssessmentSectionEntity.ProjectEntityId);
             Assert.AreEqual(expectedId, dikeAssessmentSectionEntity.DikeAssessmentSectionEntityId);
             Assert.AreEqual(someName, dikeAssessmentSectionEntity.Name);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/DbContext/DuneAssessmentSectionEntityTest.cs
===================================================================
diff -u -re7acba10209b18e88bf89d9211f6fc031d0f992e -ra65bc56647a666fad39e7fe48fbce3a5c040dfee
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/DbContext/DuneAssessmentSectionEntityTest.cs	(.../DuneAssessmentSectionEntityTest.cs)	(revision e7acba10209b18e88bf89d9211f6fc031d0f992e)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/DbContext/DuneAssessmentSectionEntityTest.cs	(.../DuneAssessmentSectionEntityTest.cs)	(revision a65bc56647a666fad39e7fe48fbce3a5c040dfee)
@@ -28,6 +28,7 @@
             const string someName = "<some name>";
             const int someNorm = 5000;
 
+            // Call
             var duneAssessmentSectionEntity = new DuneAssessmentSectionEntity
             {
                 ProjectEntityId = expectedParentId,
@@ -36,7 +37,7 @@
                 Norm = someNorm
             };
 
-            // Call & Assert
+            // Assert
             Assert.AreEqual(expectedParentId, duneAssessmentSectionEntity.ProjectEntityId);
             Assert.AreEqual(expectedId, duneAssessmentSectionEntity.DuneAssessmentSectionEntityId);
             Assert.AreEqual(someName, duneAssessmentSectionEntity.Name);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
===================================================================
diff -u -r46f39b6003e678cb2fa3add0365f78f09701cf63 -ra65bc56647a666fad39e7fe48fbce3a5c040dfee
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision 46f39b6003e678cb2fa3add0365f78f09701cf63)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision a65bc56647a666fad39e7fe48fbce3a5c040dfee)
@@ -15,29 +15,7 @@
     {
         private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Storage, "DatabaseFiles");
         private readonly string tempRingtoetsFile = Path.Combine(TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Storage, "DatabaseFiles"), "tempProjectFile.rtd");
-        private Project fullProject;
 
-        [SetUp]
-        public void Setup()
-        {
-            fullProject = new Project()
-            {
-                Name = "tempProjectFile",
-                Description = "description",
-                Items =
-                {
-                    new DikeAssessmentSection
-                    {
-                        Name = "dikeAssessmentSection"
-                    },
-                    new DuneAssessmentSection
-                    {
-                        Name = "duneAssessmentSection"
-                    }
-                }
-            };
-        }
-
         [TestFixtureTearDown]
         [TearDown]
         public void TearDownTempRingtoetsFile()
@@ -49,6 +27,7 @@
         public void SaveProjectAs_SaveAsNewFile_ProjectAsEntitiesInBothFiles()
         {
             // Setup
+            Project fullProject = GetFullProject();
             var tempFile = Path.Combine(testDataPath, "tempProjectAsFile.rtd");
 
             StorageSqLite storage = new StorageSqLite();
@@ -102,6 +81,7 @@
         {
             // Setup
             StorageSqLite storage = new StorageSqLite();
+            Project fullProject = GetFullProject();
             TestDelegate precondition = () => storage.SaveProjectAs(tempRingtoetsFile, fullProject);
             Assert.DoesNotThrow(precondition, String.Format("Precondition: file '{0}' must be a valid Ringtoets database file.", tempRingtoetsFile));
 
@@ -207,6 +187,26 @@
             }
         }
 
+        private static Project GetFullProject()
+        {
+            return new Project()
+            {
+                Name = "tempProjectFile",
+                Description = "description",
+                Items =
+                {
+                    new DikeAssessmentSection
+                    {
+                        Name = "dikeAssessmentSection"
+                    },
+                    new DuneAssessmentSection
+                    {
+                        Name = "duneAssessmentSection"
+                    }
+                }
+            };
+        }
+
         private void TearDownTempRingtoetsFile(string filePath)
         {
             GC.Collect();
Index: Core/Common/src/Core.Common.Base/Storage/IStoreProject.cs
===================================================================
diff -u -rfbb37872d09f1ded75ce2209e8e48a6b64d8a78f -ra65bc56647a666fad39e7fe48fbce3a5c040dfee
--- Core/Common/src/Core.Common.Base/Storage/IStoreProject.cs	(.../IStoreProject.cs)	(revision fbb37872d09f1ded75ce2209e8e48a6b64d8a78f)
+++ Core/Common/src/Core.Common.Base/Storage/IStoreProject.cs	(.../IStoreProject.cs)	(revision a65bc56647a666fad39e7fe48fbce3a5c040dfee)
@@ -19,6 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times. 
 // All rights reserved.
 
+using System;
 using Core.Common.Base.Data;
 
 namespace Core.Common.Base.Storage
@@ -52,6 +53,8 @@
         /// <param name="connectionArguments"></param>
         /// <param name="project">The <see cref="Project"/> to save.</param>
         /// <returns>Returns the number of changes that were saved.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="project"/> is null.</exception>
+        /// <exception cref="System.ArgumentException"><paramref name="databaseFilePath"/> is invalid.</exception>
         /// <exception cref="StorageException">Thrown when
         /// <list type="bullet">
         /// <item><paramref name="connectionArguments"/> does not exist.</item>
@@ -69,9 +72,14 @@
         /// <param name="connectionArguments">Arguments required to connect to the storage.</param>
         /// <returns>Returns a new instance of <see cref="Project"/> with the data from the storage or <c>null</c> when not found.</returns>
         /// <exception cref="System.ArgumentException"><paramref name="connectionArguments"/> is invalid.</exception>
-        /// <exception cref="CouldNotConnectException">Thrown when no new storage was created.</exception>
-        /// <exception cref="UpdateStorageException">Thrown when updating the storage fails.</exception>
-        /// <exception cref="StorageValidationException">Thrown when the storage is no valid Ringtoets project.</exception>
+        /// <exception cref="StorageException">Thrown when
+        /// <list type="bullet">
+        /// <item><paramref name="connectionArguments"/> is invalid.</item>
+        /// <item>The storage does not contain all requested tables.</item>
+        /// <item>The connection to the storage failed.</item>
+        /// <item>The related entity was not found in the storage.</item>
+        /// </list>
+        /// </exception>
         Project LoadProject(string connectionArguments);
     }
 }
\ No newline at end of file
Index: Ringtoets.sln
===================================================================
diff -u -r3167b898b071fea4cf86c775bca5467fab086038 -ra65bc56647a666fad39e7fe48fbce3a5c040dfee
--- Ringtoets.sln	(.../Ringtoets.sln)	(revision 3167b898b071fea4cf86c775bca5467fab086038)
+++ Ringtoets.sln	(.../Ringtoets.sln)	(revision a65bc56647a666fad39e7fe48fbce3a5c040dfee)
@@ -834,7 +834,6 @@
 		{209AC67F-DCFA-4355-B45A-9D9A2E4593D2} = {FE36E7E0-D5F7-48E3-9730-D05443351EAD}
 		{39EB5D07-C076-484C-9621-B34C4E5BF64C} = {85F88AB0-CA03-48D3-B5A0-DF0848C24AB0}
 		{EE8D5A6C-4871-452A-A69B-F04E374D715E} = {85F88AB0-CA03-48D3-B5A0-DF0848C24AB0}
-		{C90B77DA-E421-43CC-B82E-529651BC21AC} = {8261CCE1-98D7-465B-BC94-4ED239DE7F2E}
 		{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98} = {8261CCE1-98D7-465B-BC94-4ED239DE7F2E}
 		{30E4C2AE-719E-4D70-9FA9-668A9767FBFA} = {8261CCE1-98D7-465B-BC94-4ED239DE7F2E}
 		{3BBFD65B-B277-4E50-AE6D-BD24C3434609} = {8261CCE1-98D7-465B-BC94-4ED239DE7F2E}
@@ -850,6 +849,7 @@
 		{A8CE1456-1880-4FC8-84B3-D618EA88F384} = {0D9858E1-CF2D-4DE5-AC0E-64401900D531}
 		{FAF691DE-EAF5-44E0-A865-5A03FB395ED1} = {0D9858E1-CF2D-4DE5-AC0E-64401900D531}
 		{0EDC6D7D-E9CD-408A-9EA9-3E7D426809C8} = {0D9858E1-CF2D-4DE5-AC0E-64401900D531}
+		{C90B77DA-E421-43CC-B82E-529651BC21AC} = {0D9858E1-CF2D-4DE5-AC0E-64401900D531}
 		{93E73FAB-FAE8-49C6-9ABB-27D24DF761F6} = {4B4F0984-5730-4E28-93E7-DDE0F29BA550}
 		{ED20DBA9-D577-423F-A68D-A0A8130FB10B} = {4B4F0984-5730-4E28-93E7-DDE0F29BA550}
 		{4163B996-3455-4324-A38A-9F2F0E6FCB52} = {4B4F0984-5730-4E28-93E7-DDE0F29BA550}