Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
===================================================================
diff -u -rda65cd978b7ca2979e5ecf0132545b5028c1d976 -rbcbae879035d5472efff973990ba1194e38b2ea5
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision da65cd978b7ca2979e5ecf0132545b5028c1d976)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision bcbae879035d5472efff973990ba1194e38b2ea5)
@@ -63,8 +63,7 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="Builders\FileWriterErrorMessageBuilder.cs" />
-    <Compile Include="Exceptions\UpdateDatabaseException.cs" />
-    <Compile Include="RingtoetsDatabaseCreator.cs" />
+    <Compile Include="StorageSqliteCreator.cs" />
     <Compile Include="DbContext\RingtoetsEntitiesPartial.cs" />
     <Compile Include="Exceptions\EntityNotFoundException.cs" />
     <Compile Include="Converters\ProjectEntityConverter.cs" />
@@ -94,7 +93,7 @@
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
     <Compile Include="SqLiteStorageConnection.cs" />
-    <Compile Include="StorageToFile.cs" />
+    <Compile Include="StorageToDatabaseFile.cs" />
     <Compile Include="StorageSqLite.cs" />
     <Compile Include="DbContext\Version.cs">
       <DependentUpon>RingtoetsEntities.tt</DependentUpon>
@@ -150,7 +149,9 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <None Include="DbContext\DatabaseStructure.sql" />
+    <None Include="DbContext\DatabaseStructure.sql">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql
===================================================================
diff -u -rafc121510f818769b49ae9fd3a7297524aff1d65 -rbcbae879035d5472efff973990ba1194e38b2ea5
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql	(.../DatabaseStructure.sql)	(revision afc121510f818769b49ae9fd3a7297524aff1d65)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql	(.../DatabaseStructure.sql)	(revision bcbae879035d5472efff973990ba1194e38b2ea5)
@@ -7,10 +7,12 @@
 BEGIN TRANSACTION;
 
 -- Table: Version
-CREATE TABLE IF NOT EXISTS Version (VersionId INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, FromVersion VARCHAR (50), ToVersion VARCHAR (50), Timestamp NUMERIC);
+DROP TABLE IF EXISTS Version;
+CREATE TABLE Version (VersionId INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, FromVersion VARCHAR (50), ToVersion VARCHAR (50), Timestamp NUMERIC);
 
 -- Table: ProjectEntity
-CREATE TABLE IF NOT EXISTS ProjectEntity (ProjectEntityId INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, Name VARCHAR (1024), Description VARCHAR (1024), LastUpdated INTEGER DEFAULT (CURRENT_TIMESTAMP));
+DROP TABLE IF EXISTS ProjectEntity;
+CREATE TABLE ProjectEntity (ProjectEntityId INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, Name VARCHAR (1024), Description VARCHAR (1024), LastUpdated INTEGER DEFAULT (CURRENT_TIMESTAMP));
 
 COMMIT TRANSACTION;
 PRAGMA foreign_keys = on;
Fisheye: Tag bcbae879035d5472efff973990ba1194e38b2ea5 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/Exceptions/UpdateDatabaseException.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Properties/Resources.Designer.cs
===================================================================
diff -u -rafc121510f818769b49ae9fd3a7297524aff1d65 -rbcbae879035d5472efff973990ba1194e38b2ea5
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision afc121510f818769b49ae9fd3a7297524aff1d65)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision bcbae879035d5472efff973990ba1194e38b2ea5)
@@ -70,10 +70,12 @@
         ///BEGIN TRANSACTION;
         ///
         ///-- Table: Version
-        ///CREATE TABLE IF NOT EXISTS Version (VersionId INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, FromVersion VARCHAR (50), ToVersion VARCHAR (50), Timestamp NUMERIC);
+        ///DROP TABLE IF EXISTS Version;
+        ///CREATE TABLE Version (VersionId INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, FromVersion VARCHAR (50), ToVersion VARCHAR (50), Timestamp NUMERIC);
         ///
         ///-- Table: ProjectEntity
-        ///njnklnk CREATE TABLE IF NOT EXISTS ProjectEntity (ProjectEntityId INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, Name VARCHAR (1024), Des [rest of string was truncated]&quot;;.
+        ///DROP TABLE IF EXISTS ProjectEntity;
+        ///CREATE TABLE ProjectEntity (ProjectEntityId INTEGER NOT NULL PRIMARY KEY AUTOINC [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string DatabaseStructure {
             get {
@@ -82,6 +84,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Kan geen verbinding maken naar het Ringtoets bestand &apos;{0}&apos;..
+        /// </summary>
+        internal static string Error_Connecting_To_0 {
+            get {
+                return ResourceManager.GetString("Error_Connecting_To_0", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Er is een fout opgetreden in de verbinding met het Ringtoets bestand..
         /// </summary>
         internal static string Error_During_Connection {
@@ -100,6 +111,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Het bestand &apos;{0}&apos; is geen geldig Ringtoets bestand..
+        /// </summary>
+        internal static string Error_Validating_Database_0 {
+            get {
+                return ResourceManager.GetString("Error_Validating_Database_0", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Een fout is opgetreden met schrijven naar het nieuwe Ringtoets bestand..
         /// </summary>
         internal static string Error_Write_Structure_to_Database {
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Properties/Resources.resx
===================================================================
diff -u -rafc121510f818769b49ae9fd3a7297524aff1d65 -rbcbae879035d5472efff973990ba1194e38b2ea5
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Properties/Resources.resx	(.../Resources.resx)	(revision afc121510f818769b49ae9fd3a7297524aff1d65)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Properties/Resources.resx	(.../Resources.resx)	(revision bcbae879035d5472efff973990ba1194e38b2ea5)
@@ -121,12 +121,18 @@
   <data name="DatabaseStructure" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\DbContext\DatabaseStructure.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
+  <data name="Error_Connecting_To_0" xml:space="preserve">
+    <value>Kan geen verbinding maken naar het Ringtoets bestand '{0}'.</value>
+  </data>
   <data name="Error_During_Connection" xml:space="preserve">
     <value>Er is een fout opgetreden in de verbinding met het Ringtoets bestand.</value>
   </data>
   <data name="Error_Update_Database" xml:space="preserve">
     <value>Een fout is opgetreden met het updaten van het Ringtoets bestand.</value>
   </data>
+  <data name="Error_Validating_Database_0" xml:space="preserve">
+    <value>Het bestand '{0}' is geen geldig Ringtoets bestand.</value>
+  </data>
   <data name="Error_Write_Structure_to_Database" xml:space="preserve">
     <value>Een fout is opgetreden met schrijven naar het nieuwe Ringtoets bestand.</value>
   </data>
Fisheye: Tag bcbae879035d5472efff973990ba1194e38b2ea5 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/RingtoetsDatabaseCreator.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqLite.cs
===================================================================
diff -u -rda65cd978b7ca2979e5ecf0132545b5028c1d976 -rbcbae879035d5472efff973990ba1194e38b2ea5
--- Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqLite.cs	(.../StorageSqLite.cs)	(revision da65cd978b7ca2979e5ecf0132545b5028c1d976)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqLite.cs	(.../StorageSqLite.cs)	(revision bcbae879035d5472efff973990ba1194e38b2ea5)
@@ -4,10 +4,9 @@
 using System.IO;
 using Application.Ringtoets.Storage.Converters;
 using Application.Ringtoets.Storage.DbContext;
-using Application.Ringtoets.Storage.Exceptions;
 using Application.Ringtoets.Storage.Properties;
 using Core.Common.Base.Data;
-using Core.Common.Utils;
+using Core.Common.Base.Storage;
 using Core.Common.Utils.Builders;
 using UtilsResources = Core.Common.Utils.Properties.Resources;
 
@@ -16,62 +15,23 @@
     /// <summary>
     /// This class interacts with an SQLite database file using the Entity Framework.
     /// </summary>
-    public class StorageSqLite : StorageToFile
+    public class StorageSqLite : StorageToDatabaseFile, IStoreProject
     {
         /// <summary>
-        /// Creates a new instance of <see cref="StorageSqLite"/>.
-        /// </summary>
-        /// <param name="databaseFilePath">Path to database file.</param>
-        /// <exception cref="System.ArgumentException">Thrown when <paramref name="databaseFilePath"/> is invalid.</exception>
-        /// <exception cref="FileNotFoundException">Thrown when <paramref name="databaseFilePath"/> does not exist.</exception>
-        public StorageSqLite(string databaseFilePath)
-            : base(databaseFilePath)
-        {
-            FileUtils.ValidateFilePath(databaseFilePath);
-
-            if (!File.Exists(databaseFilePath))
-            {
-                var message = new FileReaderErrorMessageBuilder(databaseFilePath).Build(UtilsResources.Error_File_does_not_exist);
-                throw new FileNotFoundException(message);
-            }
-
-            ConnectionString = SqLiteStorageConnection.BuildSqLiteEntityConnectionString(databaseFilePath);
-        }
-
-        /// <summary>
-        /// Tests if a connection can be made to a Ringtoets project file by verifying if the table 'Version' exists.
-        /// </summary>
-        /// <returns>Returns <c>true</c> if a valid connection can be made, <c>false</c> otherwise.</returns>
-        public bool TestConnection()
-        {
-            using (var dbContext = new RingtoetsEntities(ConnectionString))
-            {
-                try
-                {
-                    dbContext.Database.Initialize(true);
-                    dbContext.Versions.Load();
-                    return true;
-                }
-                catch
-                {
-                    return false;
-                }
-            }
-        }
-
-        /// <summary>
         /// Converts <paramref name="project"/> to a new <see cref="ProjectEntity"/> in the database.
         /// </summary>
+        /// <param name="databaseFilePath">Path to database file.</param>
         /// <param name="project"><see cref="Project"/> to save.</param>
         /// <returns>Returns the number of changes that were saved in <see cref="RingtoetsEntities"/>.</returns>
-        /// <exception cref="UpdateDatabaseException">Thrown when
+        /// <exception cref="UpdateStorageException">Thrown when
         /// <list type="bullet">
         /// <item>Saving the <paramref name="project"/> to the database failed.</item>
         /// <item>The connection to the database file failed.</item>
         /// </list>
         /// </exception>
-        public int SaveProjectAs(Project project)
+        public int SaveProjectAs(string databaseFilePath, Project project)
         {
+            ConnectToNew(databaseFilePath);
             using (var dbContext = new RingtoetsEntities(ConnectionString))
             {
                 try
@@ -83,26 +43,91 @@
                 }
                 catch (DataException exception)
                 {
-                    throw CreateUpdateDatabaseException(Resources.Error_Update_Database, exception);
+                    throw CreateUpdateStorageException(Resources.Error_Update_Database, exception);
                 }
                 catch (SystemException exception)
                 {
-                    throw CreateUpdateDatabaseException(Resources.Error_During_Connection, exception);
+                    throw CreateUpdateStorageException(Resources.Error_During_Connection, exception);
                 }
             }
         }
 
         /// <summary>
         /// Attempts to load the <see cref="Project"/> from the SQLite database.
         /// </summary>
+        /// <param name="databaseFilePath">Path to database file.</param>
         /// <returns>Returns a new instance of <see cref="Project"/> with the data from the database or <c>null</c> when not found.</returns>
-        /// <exception cref="ArgumentNullException">Thrown when ProjectEntities is null.</exception>
-        public Project LoadProject()
+        /// <exception cref="System.ArgumentException"><paramref name="databaseFilePath"/> is invalid.</exception>
+        /// <exception cref="CouldNotConnectException">Thrown when <paramref name="databaseFilePath"/> does not exist.</exception>
+        /// <exception cref="StorageValidationException">Thrown when the database does not contain the table <c>version</c>.</exception>
+        public Project LoadProject(string databaseFilePath)
         {
+            Connect(databaseFilePath);
             using (var dbContext = new RingtoetsEntities(ConnectionString))
             {
                 return ProjectEntityConverter.GetProject(dbContext.ProjectEntities);
             }
         }
+
+        /// <summary>
+        /// Attempts to connect to existing storage file <paramref name="databaseFilePath"/>.
+        /// </summary>
+        /// <param name="databaseFilePath">Path to database file.</param>
+        /// <exception cref="System.ArgumentException"><paramref name="databaseFilePath"/> is invalid.</exception>
+        /// <exception cref="CouldNotConnectException">Thrown when <paramref name="databaseFilePath"/> does not exist.</exception>
+        /// <exception cref="StorageValidationException">Thrown when the database does not contain the table <c>version</c>.</exception>
+        protected override void Connect(string databaseFilePath)
+        {
+            base.Connect(databaseFilePath);
+
+            if (!File.Exists(databaseFilePath))
+            {
+                var message = new FileReaderErrorMessageBuilder(databaseFilePath).Build(UtilsResources.Error_File_does_not_exist);
+                throw new CouldNotConnectException(message);
+            }
+
+            ConnectionString = SqLiteStorageConnection.BuildSqLiteEntityConnectionString(databaseFilePath);
+
+            ValidateStorage();
+        }
+
+        /// <summary>
+        /// Creates a new (empty) Ringtoets database file.
+        /// </summary>
+        /// <param name="databaseFilePath">Path to database file.</param>
+        /// <exception cref="System.ArgumentException"><paramref name="databaseFilePath"/> is invalid.</exception>
+        /// <exception cref="CouldNotConnectException">Thrown when <paramref name="databaseFilePath"/> was not created.</exception>
+        /// <exception cref="UpdateStorageException">Thrown when executing <c>DatabaseStructure</c> script fails.</exception>
+        /// <exception cref="StorageValidationException">Thrown when the database does not contain the table <c>version</c>.</exception>
+        private void ConnectToNew(string databaseFilePath)
+        {
+            base.Connect(databaseFilePath);
+
+            var creator = new StorageSqliteCreator();
+            creator.CreateDatabaseStructure(databaseFilePath);
+
+            Connect(databaseFilePath);
+        }
+
+        /// <summary>
+        /// Validates if the connected storage is a valid Ringtoets database.
+        /// </summary>
+        /// <exception cref="ArgumentNullException">Thrown when <c>ConnectionString</c> has not been set.</exception>
+        /// <exception cref="StorageValidationException">Thrown when the database does not contain the table <c>version</c>.</exception>
+        private void ValidateStorage()
+        {
+            using (var dbContext = new RingtoetsEntities(ConnectionString))
+            {
+                try
+                {
+                    dbContext.Database.Initialize(true);
+                    dbContext.Versions.Load();
+                }
+                catch
+                {
+                    throw new StorageValidationException(string.Format(Resources.Error_Validating_Database_0, FilePath));
+                }
+            }
+        }
     }
 }
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqliteCreator.cs
===================================================================
diff -u
--- Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqliteCreator.cs	(revision 0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqliteCreator.cs	(revision bcbae879035d5472efff973990ba1194e38b2ea5)
@@ -0,0 +1,47 @@
+using System.Data.SQLite;
+using System.IO;
+using Application.Ringtoets.Storage.Properties;
+using Core.Common.Base.Storage;
+
+namespace Application.Ringtoets.Storage
+{
+    /// <summary>
+    /// This class interacts with an empty or new SQLite database file.
+    /// </summary>
+    public class StorageSqliteCreator : StorageToDatabaseFile
+    {
+        /// <summary>
+        /// Creates the basic database structure for a Ringtoets database file.
+        /// </summary>
+        /// <param name="databaseFilePath">Path to database file.</param>
+        /// <exception cref="System.ArgumentException"><paramref name="databaseFilePath"/> is invalid.</exception>
+        /// <exception cref="UpdateStorageException">Thrown when executing <c>DatabaseStructure</c> script fails.</exception>
+        public void CreateDatabaseStructure(string databaseFilePath)
+        {
+            Connect(databaseFilePath);
+
+            if (!File.Exists(databaseFilePath))
+            {
+                SQLiteConnection.CreateFile(databaseFilePath);
+            }
+            ConnectionString = SqLiteStorageConnection.BuildSqLiteConnectionString(databaseFilePath);
+            using (var dbContext = new SQLiteConnection(ConnectionString))
+            {
+                using (var command = dbContext.CreateCommand())
+                {
+                    dbContext.Open();
+                    command.CommandText = Resources.DatabaseStructure;
+                    try
+                    {
+                        command.ExecuteNonQuery();
+                    }
+                    catch (SQLiteException exception)
+                    {
+                        throw CreateUpdateStorageException(Resources.Error_Write_Structure_to_Database, exception);
+                    }
+                    dbContext.Close();
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/StorageToDatabaseFile.cs
===================================================================
diff -u
--- Application/Ringtoets/src/Application.Ringtoets.Storage/StorageToDatabaseFile.cs	(revision 0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/StorageToDatabaseFile.cs	(revision bcbae879035d5472efff973990ba1194e38b2ea5)
@@ -0,0 +1,39 @@
+using System;
+using Application.Ringtoets.Storage.Builders;
+using Core.Common.Base.Storage;
+using Core.Common.Utils;
+
+namespace Application.Ringtoets.Storage
+{
+    /// <summary>
+    /// Base class to interact with file based database storage.
+    /// </summary>
+    public abstract class StorageToDatabaseFile
+    {
+        protected string FilePath;
+        protected string ConnectionString;
+
+        /// <summary>
+        /// Validates the <paramref name="filePath"/>.
+        /// </summary>
+        /// <param name="filePath">Path to storage database file.</param>
+        /// <exception cref="System.ArgumentException"><paramref name="filePath"/> is invalid.</exception>
+        protected virtual void Connect(string filePath)
+        {
+            FileUtils.ValidateFilePath(filePath);
+            FilePath = filePath;
+        }
+
+        /// <summary>
+        /// Throws a configured instance of <see cref="UpdateStorageException"/>.
+        /// </summary>
+        /// <param name="errorMessage">The critical error message.</param>
+        /// <param name="innerException">Optional: exception that caused this exception to be thrown.</param>
+        /// <returns>Returns a new <see cref="UpdateStorageException"/></returns>
+        protected UpdateStorageException CreateUpdateStorageException(string errorMessage, Exception innerException = null)
+        {
+            var message = new FileWriterErrorMessageBuilder(FilePath).Build(errorMessage);
+            return new UpdateStorageException(message, innerException);
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag bcbae879035d5472efff973990ba1194e38b2ea5 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/StorageToFile.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs
===================================================================
diff -u -ra29bbf84cad8d8e7d3aa12c8fe84d9cf4b3653f9 -rbcbae879035d5472efff973990ba1194e38b2ea5
--- Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs	(.../App.xaml.cs)	(revision a29bbf84cad8d8e7d3aa12c8fe84d9cf4b3653f9)
+++ Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs	(.../App.xaml.cs)	(revision bcbae879035d5472efff973990ba1194e38b2ea5)
@@ -11,6 +11,7 @@
 using System.Windows;
 using System.Windows.Controls.Primitives;
 using System.Windows.Forms;
+using Application.Ringtoets.Storage;
 using Core.Common.Base.Plugin;
 using Core.Common.Controls.Dialogs;
 using Core.Common.Gui;
@@ -138,7 +139,8 @@
                     , new OxyPlotGuiPlugin()
                     , new DotSpatialGuiPlugin()
 #endif
-                }
+                },
+                Storage = new StorageSqLite()
             };
 
             var mainWindow = new MainWindow(gui);
Index: Application/Ringtoets/src/Application.Ringtoets/Application.Ringtoets.csproj
===================================================================
diff -u -ra29bbf84cad8d8e7d3aa12c8fe84d9cf4b3653f9 -rbcbae879035d5472efff973990ba1194e38b2ea5
--- Application/Ringtoets/src/Application.Ringtoets/Application.Ringtoets.csproj	(.../Application.Ringtoets.csproj)	(revision a29bbf84cad8d8e7d3aa12c8fe84d9cf4b3653f9)
+++ Application/Ringtoets/src/Application.Ringtoets/Application.Ringtoets.csproj	(.../Application.Ringtoets.csproj)	(revision bcbae879035d5472efff973990ba1194e38b2ea5)
@@ -180,6 +180,10 @@
       <Name>Ringtoets.Piping.Plugin</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\Application.Ringtoets.Storage\Application.Ringtoets.Storage.csproj">
+      <Project>{50963f12-448c-41ba-a62c-cdb0ab8d21e0}</Project>
+      <Name>Application.Ringtoets.Storage</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config">
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj
===================================================================
diff -u -rda65cd978b7ca2979e5ecf0132545b5028c1d976 -rbcbae879035d5472efff973990ba1194e38b2ea5
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj	(.../Application.Ringtoets.Storage.Test.csproj)	(revision da65cd978b7ca2979e5ecf0132545b5028c1d976)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj	(.../Application.Ringtoets.Storage.Test.csproj)	(revision bcbae879035d5472efff973990ba1194e38b2ea5)
@@ -73,7 +73,6 @@
   <ItemGroup>
     <Compile Include="Converter\ProjectEntityConverterTest.cs" />
     <Compile Include="DbContext\ProjectEntityTest.cs" />
-    <Compile Include="Exceptions\UpdateDatabaseExceptionTest.cs" />
     <Compile Include="Exceptions\EntityNotFoundExceptionTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SqLiteStorageConnectionTest.cs" />
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/DbContext/ProjectEntityTest.cs
===================================================================
diff -u -rda65cd978b7ca2979e5ecf0132545b5028c1d976 -rbcbae879035d5472efff973990ba1194e38b2ea5
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/DbContext/ProjectEntityTest.cs	(.../ProjectEntityTest.cs)	(revision da65cd978b7ca2979e5ecf0132545b5028c1d976)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/DbContext/ProjectEntityTest.cs	(.../ProjectEntityTest.cs)	(revision bcbae879035d5472efff973990ba1194e38b2ea5)
@@ -21,10 +21,10 @@
         public void GetProperties_WithData_ReturnExpectedValues()
         {
             // Setup
-            const long expectedId = 1024;
+            const long expectedId = 1024L;
             const string expectedName = "<some name>";
             const string someDescription = "<some description>";
-            const long someTimestamp = 123456789;
+            const long someTimestamp = 123456789L;
 
             var projectEntity = new ProjectEntity
             {
Fisheye: Tag bcbae879035d5472efff973990ba1194e38b2ea5 refers to a dead (removed) revision in file `Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Exceptions/UpdateDatabaseExceptionTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/SqLiteStorageConnectionTest.cs
===================================================================
diff -u -rafc121510f818769b49ae9fd3a7297524aff1d65 -rbcbae879035d5472efff973990ba1194e38b2ea5
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/SqLiteStorageConnectionTest.cs	(.../SqLiteStorageConnectionTest.cs)	(revision afc121510f818769b49ae9fd3a7297524aff1d65)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/SqLiteStorageConnectionTest.cs	(.../SqLiteStorageConnectionTest.cs)	(revision bcbae879035d5472efff973990ba1194e38b2ea5)
@@ -6,12 +6,24 @@
     class SqLiteStorageConnectionTest
     {
         [Test]
-        public void BuildConnectionString_ValidFile_ValidConnectionString()
+        public void BuildSqLiteEntityConnectionString_ValidFile_ValidConnectionString()
         {
             const string validFile = "validFile";
             var connectionString = SqLiteStorageConnection.BuildSqLiteEntityConnectionString(validFile);
             Assert.IsNotNullOrEmpty(connectionString);
             StringAssert.Contains(validFile, connectionString);
+            StringAssert.Contains("System.Data.SQLite.EF6", connectionString);
+            StringAssert.Contains("DbContext.RingtoetsEntities", connectionString);
         }
+        
+        [Test]
+        public void BuildSqLiteConnectionString_ValidFile_ValidConnectionString()
+        {
+            const string validFile = "validFile";
+            var connectionString = SqLiteStorageConnection.BuildSqLiteConnectionString(validFile);
+            Assert.IsNotNullOrEmpty(connectionString);
+            StringAssert.Contains(validFile, connectionString);
+            StringAssert.DoesNotContain("System.Data.SQLite.EF6", connectionString);
+        }
     }
 }
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/StorageSQLiteTest.cs
===================================================================
diff -u -rda65cd978b7ca2979e5ecf0132545b5028c1d976 -rbcbae879035d5472efff973990ba1194e38b2ea5
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/StorageSQLiteTest.cs	(.../StorageSQLiteTest.cs)	(revision da65cd978b7ca2979e5ecf0132545b5028c1d976)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/StorageSQLiteTest.cs	(.../StorageSQLiteTest.cs)	(revision bcbae879035d5472efff973990ba1194e38b2ea5)
@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using Core.Common.Base.Data;
+using Core.Common.Base.Storage;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using UtilsResources = Core.Common.Utils.Properties.Resources;
@@ -13,29 +14,12 @@
         private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Storage, "DatabaseFiles");
 
         [Test]
-        [TestCase("empty.rt")]
-        public void Constructor_ValidPath_NewInstance(string validPath)
-        {
-            // Setup
-            var dbFile = Path.Combine(testDataPath, validPath);
-
-            // Precondition
-            Assert.IsTrue(File.Exists(dbFile), "Precondition: file must exist.");
-
-            // Call
-            TestDelegate test = () => new StorageSqLite(dbFile);
-
-            // Assert
-            Assert.DoesNotThrow(test);
-        }
-
-        [Test]
         [TestCase(null)]
         [TestCase("")]
-        public void Constructor_FileNullOrEmpty_ThrowsFileNotFoundException(string invalidPath)
+        public void LoadProject_InvalidPath_ThrowsArgumentException(string invalidPath)
         {
             // Call
-            TestDelegate test = () => new StorageSqLite(invalidPath);
+            TestDelegate test = () => new StorageSqLite().LoadProject(invalidPath);
 
             // Assert
             ArgumentException exception = Assert.Throws<ArgumentException>(test);
@@ -45,67 +29,47 @@
         }
 
         [Test]
-        [TestCase("NonExistingFile")]
-        public void Constructor_InvalidPath_ThrowsFileNotFoundException(string invalidPath)
+        [TestCase("fileDoesNotExist")]
+        public void LoadProject_NonExistingPath_ThrowsCouldNotConnectException(string nonExistingPath)
         {
             // Call
-            TestDelegate test = () => new StorageSqLite(invalidPath);
+            TestDelegate test = () => new StorageSqLite().LoadProject(nonExistingPath);
 
             // Assert
-            FileNotFoundException exception = Assert.Throws<FileNotFoundException>(test);
-            string expectedMessage = String.Format("Fout bij het lezen van bestand '{0}': {1}",
-                                                   invalidPath, UtilsResources.Error_File_does_not_exist);
+            CouldNotConnectException exception = Assert.Throws<CouldNotConnectException>(test);
+            string expectedMessage = String.Format(@"Fout bij het lezen van bestand '{0}': Het bestand bestaat niet.", nonExistingPath);
             Assert.AreEqual(expectedMessage, exception.Message);
         }
 
         [Test]
-        [TestCase("ValidRingtoetsDatabase.rt")]
-        public void TestConnection_ValidConnection_ReturnsTrue(string validPath)
+        [TestCase("empty.rt")]
+        public void LoadProject_InvalidRingtoetsFile_ThrowsStorageValidationException(string validPath)
         {
             // Setup
             var dbFile = Path.Combine(testDataPath, validPath);
 
-            // Precondition
-            Assert.IsTrue(File.Exists(dbFile), "Precondition: file must exist.");
-
             // Call
-            StorageSqLite storage = new StorageSqLite(dbFile);
+            TestDelegate test = () => new StorageSqLite().LoadProject(dbFile);
 
             // Assert
-            Assert.True(storage.TestConnection());
+            StorageValidationException exception = Assert.Throws<StorageValidationException>(test);
+            string expectedMessage = String.Format(@"Het bestand '{0}' is geen geldig Ringtoets bestand.", dbFile);
+            Assert.AreEqual(expectedMessage, exception.Message);
         }
 
         [Test]
-        [TestCase("empty.rt")]
-        public void TestConnection_InvalidConnection_ReturnsFalse(string invalidPath)
-        {
-            // Setup
-            var dbFile = Path.Combine(testDataPath, invalidPath);
-
-            // Precondition
-            Assert.IsTrue(File.Exists(dbFile), "Precondition: file must exist.");
-
-            // Call
-            StorageSqLite storage = new StorageSqLite(dbFile);
-
-            // Assert
-            Assert.False(storage.TestConnection());
-        }
-
-        [Test]
         [TestCase("ValidRingtoetsDatabase.rt")]
         public void LoadProject_ValidDatabase_ReturnsProject(string validPath)
         {
             // Setup
             var dbFile = Path.Combine(testDataPath, validPath);
+            var storage = new StorageSqLite();
 
             // Precondition
             Assert.IsTrue(File.Exists(dbFile), "Precondition: file must exist.");
-            var storage = new StorageSqLite(dbFile);
-            Assert.True(storage.TestConnection(), "Precondition: file must be a valid Ringtoets database.");
 
             // Call
-            Project loadedProject = storage.LoadProject();
+            Project loadedProject = storage.LoadProject(dbFile);
 
             // Assert
             Assert.IsInstanceOf<Project>(loadedProject);
Index: Core/Common/src/Core.Common.Base/Core.Common.Base.csproj
===================================================================
diff -u -r7980edee4d818aa3759b179c8af269f4f1f23597 -rbcbae879035d5472efff973990ba1194e38b2ea5
--- Core/Common/src/Core.Common.Base/Core.Common.Base.csproj	(.../Core.Common.Base.csproj)	(revision 7980edee4d818aa3759b179c8af269f4f1f23597)
+++ Core/Common/src/Core.Common.Base/Core.Common.Base.csproj	(.../Core.Common.Base.csproj)	(revision bcbae879035d5472efff973990ba1194e38b2ea5)
@@ -84,6 +84,9 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="IO\ProgressChangedDelegate.cs" />
+    <Compile Include="Storage\StorageValidationException.cs" />
+    <Compile Include="Storage\CouldNotConnectException.cs" />
+    <Compile Include="Storage\IStoreProject.cs" />
     <Compile Include="Plugin\ApplicationPlugin.cs" />
     <Compile Include="Plugin\DataItemInfo.cs" />
     <Compile Include="Plugin\ApplicationCore.cs" />
@@ -103,7 +106,8 @@
     <Compile Include="Service\Activity.cs" />
     <Compile Include="Service\ActivityState.cs" />
     <Compile Include="Service\FileImportActivity.cs" />
-    <Compile Include="IStorable.cs" />
+    <Compile Include="Storage\IStorable.cs" />
+    <Compile Include="Storage\UpdateStorageException.cs" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
Index: Core/Common/src/Core.Common.Base/Data/Project.cs
===================================================================
diff -u -r7980edee4d818aa3759b179c8af269f4f1f23597 -rbcbae879035d5472efff973990ba1194e38b2ea5
--- Core/Common/src/Core.Common.Base/Data/Project.cs	(.../Project.cs)	(revision 7980edee4d818aa3759b179c8af269f4f1f23597)
+++ Core/Common/src/Core.Common.Base/Data/Project.cs	(.../Project.cs)	(revision bcbae879035d5472efff973990ba1194e38b2ea5)
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 
 using Core.Common.Base.Properties;
+using Core.Common.Base.Storage;
 
 namespace Core.Common.Base.Data
 {
Fisheye: Tag bcbae879035d5472efff973990ba1194e38b2ea5 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Base/IStorable.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/src/Core.Common.Base/Storage/CouldNotConnectException.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Base/Storage/CouldNotConnectException.cs	(revision 0)
+++ Core/Common/src/Core.Common.Base/Storage/CouldNotConnectException.cs	(revision bcbae879035d5472efff973990ba1194e38b2ea5)
@@ -0,0 +1,32 @@
+using System;
+
+namespace Core.Common.Base.Storage
+{
+    /// <summary>
+    /// The exception that is thrown when a class is unable to connect.
+    /// </summary>
+    public class CouldNotConnectException : Exception
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CouldNotConnectException"/> class.
+        /// </summary>
+        public CouldNotConnectException() {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CouldNotConnectException"/> class
+        /// with a specified error message.
+        /// </summary>
+        /// <param name="message">The error message that explains the reason for the exception.</param>
+        public CouldNotConnectException(string message) : base(message) {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CouldNotConnectException"/> class
+        /// with a specified error message and a reference to the inner exception that is
+        /// the cause of this exception.
+        /// </summary>
+        /// <param name="message">The error message that explains the reason for the exception.</param>
+        /// <param name="inner">The exception that is the cause of the current exception, 
+        /// or a null reference if no inner exception is specified.</param>
+        public CouldNotConnectException(string message, Exception inner) : base(message, inner) { }
+    }
+}
\ No newline at end of file
Index: Core/Common/src/Core.Common.Base/Storage/IStorable.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Base/Storage/IStorable.cs	(revision 0)
+++ Core/Common/src/Core.Common.Base/Storage/IStorable.cs	(revision bcbae879035d5472efff973990ba1194e38b2ea5)
@@ -0,0 +1,13 @@
+namespace Core.Common.Base.Storage
+{
+    /// <summary>
+    /// Interface that describes the property that need to be implemented on classes that are stored in the storage.
+    /// </summary>
+    public interface IStorable
+    {
+        /// <summary>
+        /// Gets or sets the unique identifier for the storage of the class.
+        /// </summary>
+        long StorageId { get; set; }
+    }
+}
Index: Core/Common/src/Core.Common.Base/Storage/IStoreProject.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Base/Storage/IStoreProject.cs	(revision 0)
+++ Core/Common/src/Core.Common.Base/Storage/IStoreProject.cs	(revision bcbae879035d5472efff973990ba1194e38b2ea5)
@@ -0,0 +1,39 @@
+using Core.Common.Base.Data;
+
+namespace Core.Common.Base.Storage
+{
+    /// <summary>
+    /// Interface that describes the methods that need to be implemented on classes that provide a storage for Ringtoets projects.
+    /// </summary>
+    public interface IStoreProject
+    {
+        /// <summary>
+        /// Converts <paramref name="project"/> to a new storage entry.
+        /// </summary>
+        /// <param name="project"><see cref="Project"/> to save.</param>
+        /// <param name="connectionArguments">Arguments required to connect to the storage.</param>
+        /// <returns>Returns the number of changes that were saved.</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="UpdateStorageException">Thrown when
+        /// <list type="bullet">
+        /// <item>Saving the <paramref name="project"/> to the storage failed.</item>
+        /// <item>The connection to the storage failed.</item>
+        /// </list>
+        /// </exception>
+        int SaveProjectAs(string connectionArguments, Project project);
+
+        /// <summary>
+        /// Attempts to load the <see cref="Project"/> from the storage.
+        /// </summary>
+        /// <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>
+        Project LoadProject(string connectionArguments);
+    }
+}
Index: Core/Common/src/Core.Common.Base/Storage/StorageValidationException.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Base/Storage/StorageValidationException.cs	(revision 0)
+++ Core/Common/src/Core.Common.Base/Storage/StorageValidationException.cs	(revision bcbae879035d5472efff973990ba1194e38b2ea5)
@@ -0,0 +1,32 @@
+using System;
+
+namespace Core.Common.Base.Storage
+{
+    /// <summary>
+    /// The exception that is thrown when a storage is not valid.
+    /// </summary>
+    public class StorageValidationException : Exception
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StorageValidationException"/> class.
+        /// </summary>
+        public StorageValidationException() {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StorageValidationException"/> class
+        /// with a specified error message.
+        /// </summary>
+        /// <param name="message">The error message that explains the reason for the exception.</param>
+        public StorageValidationException(string message) : base(message) {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StorageValidationException"/> class
+        /// with a specified error message and a reference to the inner exception that is
+        /// the cause of this exception.
+        /// </summary>
+        /// <param name="message">The error message that explains the reason for the exception.</param>
+        /// <param name="inner">The exception that is the cause of the current exception, 
+        /// or a null reference if no inner exception is specified.</param>
+        public StorageValidationException(string message, Exception inner) : base(message, inner) { }
+    }
+}
\ No newline at end of file
Index: Core/Common/src/Core.Common.Base/Storage/UpdateStorageException.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Base/Storage/UpdateStorageException.cs	(revision 0)
+++ Core/Common/src/Core.Common.Base/Storage/UpdateStorageException.cs	(revision bcbae879035d5472efff973990ba1194e38b2ea5)
@@ -0,0 +1,33 @@
+using System;
+
+namespace Core.Common.Base.Storage
+{
+    /// <summary>
+    /// The exception that is thrown when a database updater class encounters an error while
+    /// parsing a row/line during the read.
+    /// </summary>
+    public class UpdateStorageException : Exception
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UpdateStorageException"/> class.
+        /// </summary>
+        public UpdateStorageException() {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UpdateStorageException"/> class
+        /// with a specified error message.
+        /// </summary>
+        /// <param name="message">The error message that explains the reason for the exception.</param>
+        public UpdateStorageException(string message) : base(message) {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UpdateStorageException"/> class
+        /// with a specified error message and a reference to the inner exception that is
+        /// the cause of this exception.
+        /// </summary>
+        /// <param name="message">The error message that explains the reason for the exception.</param>
+        /// <param name="inner">The exception that is the cause of the current exception, 
+        /// or a null reference if no inner exception is specified.</param>
+        public UpdateStorageException(string message, Exception inner) : base(message, inner) {}
+    }
+}
\ No newline at end of file
Index: Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj
===================================================================
diff -u -rd7ef66291b1a64881d4e26b8fc30c5f66f16d67a -rbcbae879035d5472efff973990ba1194e38b2ea5
--- Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj	(.../Core.Common.Gui.csproj)	(revision d7ef66291b1a64881d4e26b8fc30c5f66f16d67a)
+++ Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj	(.../Core.Common.Gui.csproj)	(revision bcbae879035d5472efff973990ba1194e38b2ea5)
@@ -258,10 +258,6 @@
     <Compile Include="ViewPropertyEditor.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Application\Ringtoets\src\Application.Ringtoets.Storage\Application.Ringtoets.Storage.csproj">
-      <Project>{50963f12-448c-41ba-a62c-cdb0ab8d21e0}</Project>
-      <Name>Application.Ringtoets.Storage</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\GIS\src\Core.GIS.SharpMap.UI\Core.GIS.SharpMap.UI.csproj">
       <Project>{DD1CC1DB-4BF9-4C88-A100-733D84795F3A}</Project>
       <Name>Core.GIS.SharpMap.UI</Name>
Index: Core/Common/src/Core.Common.Gui/GuiCommandHandler.cs
===================================================================
diff -u -rafc121510f818769b49ae9fd3a7297524aff1d65 -rbcbae879035d5472efff973990ba1194e38b2ea5
--- Core/Common/src/Core.Common.Gui/GuiCommandHandler.cs	(.../GuiCommandHandler.cs)	(revision afc121510f818769b49ae9fd3a7297524aff1d65)
+++ Core/Common/src/Core.Common.Gui/GuiCommandHandler.cs	(.../GuiCommandHandler.cs)	(revision bcbae879035d5472efff973990ba1194e38b2ea5)
@@ -6,11 +6,11 @@
 using System.Windows.Forms;
 using System.Windows.Forms.Integration;
 using System.Windows.Input;
-using Application.Ringtoets.Storage;
 using Core.Common.Base;
 using Core.Common.Base.Data;
 using Core.Common.Base.IO;
 using Core.Common.Base.Plugin;
+using Core.Common.Base.Storage;
 using Core.Common.Controls.Views;
 using Core.Common.Gui.Forms;
 using Core.Common.Gui.Forms.MainWindow;
@@ -86,13 +86,38 @@
         public bool OpenExistingProject(string filePath)
         {
             Log.Info(Resources.Project_existing_opening_project);
-            var storage = new StorageSqLite(filePath);
-            if (!storage.TestConnection())
+
+            var storage = gui.Storage;
+            Project loadedProject;
+            try
             {
+                loadedProject = storage.LoadProject(filePath);
+            }
+            catch (ArgumentException e)
+            {
+                Log.Warn(e.Message);
                 Log.Warn(Resources.Project_existing_project_opening_failed);
                 return false;
             }
+            catch (CouldNotConnectException e)
+            {
+                Log.Warn(e.Message);
+                Log.Warn(Resources.Project_existing_project_opening_failed);
+                return false;
+            }
+            catch (StorageValidationException e)
+            {
+                Log.Warn(e.Message);
+                Log.Warn(Resources.Project_saving_project_failed);
+                return false;
+            }
 
+            if (loadedProject == null)
+            {
+                Log.Warn(Resources.Project_existing_project_opening_failed);
+                return false;
+            }
+
             // Project loaded successfully, close current project
             if (!CloseProject())
             {
@@ -101,12 +126,7 @@
             }
 
             gui.ProjectFilePath = filePath;
-            gui.Project = storage.LoadProject();
-            if (gui.Project == null)
-            {
-                Log.Warn(Resources.Project_existing_project_opening_failed);
-                return false;
-            }
+            gui.Project = loadedProject;
 
             RefreshGui();
             Log.Info(Resources.Project_existing_successfully_opened);
@@ -162,19 +182,37 @@
             }
 
             var filePath = saveFileDialog.FileName;
-
+            var storage = gui.Storage;
             try
             {
-                var ringtoetsDatabaseCreator = new RingtoetsDatabaseCreator(filePath);
-                ringtoetsDatabaseCreator.CreateDatabaseStructure();
-                var storage = new StorageSqLite(filePath);
-                storage.SaveProjectAs(gui.Project);
+                storage.SaveProjectAs(filePath, gui.Project);
             }
-            catch
+            catch (ArgumentException e)
             {
+                Log.Warn(e.Message);
+                Log.Warn(Resources.Project_existing_project_opening_failed);
+                return false;
+            }
+            catch (CouldNotConnectException e)
+            {
+                Log.Warn(e.Message);
                 Log.Warn(Resources.Project_saving_project_failed);
                 return false;
             }
+            catch (StorageValidationException e)
+            {
+                Log.Warn(e.Message);
+                Log.Warn(Resources.Project_saving_project_failed);
+                return false;
+            }
+            catch (UpdateStorageException e)
+            {
+                Log.Warn(e.Message);
+                Log.Warn(Resources.Project_saving_project_failed);
+                return false;
+            }
+
+            // Save was successful, store location
             gui.ProjectFilePath = filePath;
             Log.Info(Resources.Project_saving_project_saved);
             return true;
Index: Core/Common/src/Core.Common.Gui/IGui.cs
===================================================================
diff -u -rcd9655d356bdff388c7058eeff1cdbed076c407b -rbcbae879035d5472efff973990ba1194e38b2ea5
--- Core/Common/src/Core.Common.Gui/IGui.cs	(.../IGui.cs)	(revision cd9655d356bdff388c7058eeff1cdbed076c407b)
+++ Core/Common/src/Core.Common.Gui/IGui.cs	(.../IGui.cs)	(revision bcbae879035d5472efff973990ba1194e38b2ea5)
@@ -9,8 +9,10 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Configuration;
+using Core.Common.Base;
 using Core.Common.Base.Data;
 using Core.Common.Base.Plugin;
+using Core.Common.Base.Storage;
 using Core.Common.Controls.Views;
 using Core.Common.Gui.Forms.MainWindow;
 using Core.Common.Gui.Forms.PropertyGridView;
@@ -117,6 +119,11 @@
         object Selection { get; set; }
 
         /// <summary>
+        /// Gets or sets the current storage.
+        /// </summary>
+        IStoreProject Storage { get; }
+
+        /// <summary>
         /// Gets the <see cref="IContextMenuBuilderProvider"/> of the <see cref="IGui"/>
         /// </summary>
         IContextMenuBuilderProvider ContextMenuProvider { get; }
Index: Core/Common/src/Core.Common.Gui/RingtoetsGui.cs
===================================================================
diff -u -rb81978adc73edcf368115b58fd37f34dc7fb6ab5 -rbcbae879035d5472efff973990ba1194e38b2ea5
--- Core/Common/src/Core.Common.Gui/RingtoetsGui.cs	(.../RingtoetsGui.cs)	(revision b81978adc73edcf368115b58fd37f34dc7fb6ab5)
+++ Core/Common/src/Core.Common.Gui/RingtoetsGui.cs	(.../RingtoetsGui.cs)	(revision bcbae879035d5472efff973990ba1194e38b2ea5)
@@ -11,6 +11,7 @@
 
 using Core.Common.Base.Data;
 using Core.Common.Base.Plugin;
+using Core.Common.Base.Storage;
 using Core.Common.Controls.Views;
 using Core.Common.Gui.ContextMenu;
 using Core.Common.Gui.Forms.MainWindow;
@@ -285,6 +286,8 @@
             return resultSet;
         }
 
+        public IStoreProject Storage { get; set; }
+
         public void Dispose()
         {
             Dispose(true);
Index: Core/Common/test/Core.Common.Base.Test/Core.Common.Base.Test.csproj
===================================================================
diff -u -r00c8bc7fed580b4a9820a7d85b3b6d2346599f65 -rbcbae879035d5472efff973990ba1194e38b2ea5
--- Core/Common/test/Core.Common.Base.Test/Core.Common.Base.Test.csproj	(.../Core.Common.Base.Test.csproj)	(revision 00c8bc7fed580b4a9820a7d85b3b6d2346599f65)
+++ Core/Common/test/Core.Common.Base.Test/Core.Common.Base.Test.csproj	(.../Core.Common.Base.Test.csproj)	(revision bcbae879035d5472efff973990ba1194e38b2ea5)
@@ -86,6 +86,9 @@
     <Compile Include="Data\ProjectTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Service\FileImportActivityTest.cs" />
+    <Compile Include="Storage\StorageValidationExceptionTest.cs" />
+    <Compile Include="Storage\CouldNotConnectExceptionTest.cs" />
+    <Compile Include="Storage\UpdateStorageExceptionTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj">
Index: Core/Common/test/Core.Common.Base.Test/Storage/CouldNotConnectExceptionTest.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.Base.Test/Storage/CouldNotConnectExceptionTest.cs	(revision 0)
+++ Core/Common/test/Core.Common.Base.Test/Storage/CouldNotConnectExceptionTest.cs	(revision bcbae879035d5472efff973990ba1194e38b2ea5)
@@ -0,0 +1,53 @@
+using System;
+using Core.Common.Base.Storage;
+using NUnit.Framework;
+
+namespace Core.Common.Base.Test.Storage
+{
+    [TestFixture]
+    public class CouldNotConnectExceptionTest
+    {
+        [Test]
+        public void DefaultConstructor_InnerExceptionNullAndMessageDefault()
+        {
+            // Setup
+            string expectedMessage = String.Format("Exception of type '{0}' was thrown.", typeof(CouldNotConnectException).FullName);
+
+            // Call
+            CouldNotConnectException exception = new CouldNotConnectException();
+
+            // Assert
+            Assert.IsNull(exception.InnerException);
+            Assert.AreEqual(expectedMessage, exception.Message);
+        }
+
+        [Test]
+        public void Constructor_WithCustomMessage_InnerExceptionNullAndMessageSetToCustom()
+        {
+            // Setup
+            const string expectedMessage = "Some exception message";
+
+            // Call
+            CouldNotConnectException exception = new CouldNotConnectException(expectedMessage);
+
+            // Assert
+            Assert.IsNull(exception.InnerException);
+            Assert.AreEqual(expectedMessage, exception.Message);
+        }
+
+        [Test]
+        public void Constructor_WithCustomMessageAndInnerException_InnerExceptionSetAndMessageSetToCustom()
+        {
+            // Setup
+            const string expectedMessage = "Some exception message";
+            Exception expectedInnerException = new Exception();
+
+            // Call
+            CouldNotConnectException exception = new CouldNotConnectException(expectedMessage, expectedInnerException);
+
+            // Assert
+            Assert.AreSame(expectedInnerException, exception.InnerException);
+            Assert.AreEqual(expectedMessage, exception.Message);
+        }
+    }
+}
\ No newline at end of file
Index: Core/Common/test/Core.Common.Base.Test/Storage/StorageValidationExceptionTest.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.Base.Test/Storage/StorageValidationExceptionTest.cs	(revision 0)
+++ Core/Common/test/Core.Common.Base.Test/Storage/StorageValidationExceptionTest.cs	(revision bcbae879035d5472efff973990ba1194e38b2ea5)
@@ -0,0 +1,53 @@
+using System;
+using Core.Common.Base.Storage;
+using NUnit.Framework;
+
+namespace Core.Common.Base.Test.Storage
+{
+    [TestFixture]
+    public class StorageValidationExceptionTest
+    {
+        [Test]
+        public void DefaultConstructor_InnerExceptionNullAndMessageDefault()
+        {
+            // Setup
+            string expectedMessage = String.Format("Exception of type '{0}' was thrown.", typeof(StorageValidationException).FullName);
+
+            // Call
+            StorageValidationException exception = new StorageValidationException();
+
+            // Assert
+            Assert.IsNull(exception.InnerException);
+            Assert.AreEqual(expectedMessage, exception.Message);
+        }
+
+        [Test]
+        public void Constructor_WithCustomMessage_InnerExceptionNullAndMessageSetToCustom()
+        {
+            // Setup
+            const string expectedMessage = "Some exception message";
+
+            // Call
+            StorageValidationException exception = new StorageValidationException(expectedMessage);
+
+            // Assert
+            Assert.IsNull(exception.InnerException);
+            Assert.AreEqual(expectedMessage, exception.Message);
+        }
+
+        [Test]
+        public void Constructor_WithCustomMessageAndInnerException_InnerExceptionSetAndMessageSetToCustom()
+        {
+            // Setup
+            const string expectedMessage = "Some exception message";
+            Exception expectedInnerException = new Exception();
+
+            // Call
+            StorageValidationException exception = new StorageValidationException(expectedMessage, expectedInnerException);
+
+            // Assert
+            Assert.AreSame(expectedInnerException, exception.InnerException);
+            Assert.AreEqual(expectedMessage, exception.Message);
+        }
+    }
+}
\ No newline at end of file
Index: Core/Common/test/Core.Common.Base.Test/Storage/UpdateStorageExceptionTest.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.Base.Test/Storage/UpdateStorageExceptionTest.cs	(revision 0)
+++ Core/Common/test/Core.Common.Base.Test/Storage/UpdateStorageExceptionTest.cs	(revision bcbae879035d5472efff973990ba1194e38b2ea5)
@@ -0,0 +1,53 @@
+using System;
+using Core.Common.Base.Storage;
+using NUnit.Framework;
+
+namespace Core.Common.Base.Test.Storage
+{
+    [TestFixture]
+    public class UpdateStorageExceptionTest
+    {
+        [Test]
+        public void DefaultConstructor_InnerExceptionNullAndMessageDefault()
+        {
+            // Setup
+            string expectedMessage = String.Format("Exception of type '{0}' was thrown.", typeof(UpdateStorageException).FullName);
+
+            // Call
+            UpdateStorageException exception = new UpdateStorageException();
+
+            // Assert
+            Assert.IsNull(exception.InnerException);
+            Assert.AreEqual(expectedMessage, exception.Message);
+        }
+
+        [Test]
+        public void Constructor_WithCustomMessage_InnerExceptionNullAndMessageSetToCustom()
+        {
+            // Setup
+            const string expectedMessage = "Some exception message";
+
+            // Call
+            UpdateStorageException exception = new UpdateStorageException(expectedMessage);
+
+            // Assert
+            Assert.IsNull(exception.InnerException);
+            Assert.AreEqual(expectedMessage, exception.Message);
+        }
+
+        [Test]
+        public void Constructor_WithCustomMessageAndInnerException_InnerExceptionSetAndMessageSetToCustom()
+        {
+            // Setup
+            const string expectedMessage = "Some exception message";
+            Exception expectedInnerException = new Exception();
+
+            // Call
+            UpdateStorageException exception = new UpdateStorageException(expectedMessage, expectedInnerException);
+
+            // Assert
+            Assert.AreSame(expectedInnerException, exception.InnerException);
+            Assert.AreEqual(expectedMessage, exception.Message);
+        }
+    }
+}
\ No newline at end of file