Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
===================================================================
diff -u -r39db35bed5aea7238bcb03d842598ee87a002390 -r985570095b487598c6c2ae93b92e2bce65bf7e90
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision 39db35bed5aea7238bcb03d842598ee87a002390)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision 985570095b487598c6c2ae93b92e2bce65bf7e90)
@@ -89,7 +89,6 @@
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
     <Compile Include="SqLiteConnectionStringBuilder.cs" />
-    <Compile Include="StorageToDatabaseFile.cs" />
     <Compile Include="StorageSqLite.cs" />
     <Compile Include="DbContext\Version.cs">
       <DependentUpon>RingtoetsEntities.tt</DependentUpon>
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqLite.cs
===================================================================
diff -u -r4446122883b6ed79c3588f838854a2df9bdc5b6b -r985570095b487598c6c2ae93b92e2bce65bf7e90
--- Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqLite.cs	(.../StorageSqLite.cs)	(revision 4446122883b6ed79c3588f838854a2df9bdc5b6b)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqLite.cs	(.../StorageSqLite.cs)	(revision 985570095b487598c6c2ae93b92e2bce65bf7e90)
@@ -8,6 +8,7 @@
 using Application.Ringtoets.Storage.Properties;
 using Core.Common.Base.Data;
 using Core.Common.Base.Storage;
+using Core.Common.Utils;
 using Core.Common.Utils.Builders;
 using UtilsResources = Core.Common.Utils.Properties.Resources;
 
@@ -16,8 +17,11 @@
     /// <summary>
     /// This class interacts with an SQLite database file using the Entity Framework.
     /// </summary>
-    public class StorageSqLite : StorageToDatabaseFile, IStoreProject
+    public class StorageSqLite : IStoreProject
     {
+        private string filePath;
+        private string connectionString;
+
         /// <summary>
         /// Converts <paramref name="project"/> to a new <see cref="ProjectEntity"/> in the database.
         /// </summary>
@@ -26,18 +30,18 @@
         /// <returns>Returns the number of changes that were saved in <see cref="RingtoetsEntities"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="project"/> is null.</exception>
         /// <exception cref="System.ArgumentException"><paramref name="databaseFilePath"/> is invalid.</exception>
-        /// <exception cref="StorageValidationException">Thrown when the database does not contain the table <c>version</c>.</exception>
-        /// <exception cref="CouldNotConnectException">Thrown when <paramref name="databaseFilePath"/> was not created.</exception>
-        /// <exception cref="UpdateStorageException">Thrown when
+        /// <exception cref="StorageException">Thrown when
         /// <list type="bullet">
+        /// <item>The database does not contain the table <c>version</c></item>
+        /// <item>THe file <paramref name="databaseFilePath"/> was not created.</item>
         /// <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(string databaseFilePath, Project project)
         {
-            ConnectToNew(databaseFilePath);
-            using (var dbContext = new RingtoetsEntities(ConnectionString))
+            SetConnectionToNewFile(databaseFilePath);
+            using (var dbContext = new RingtoetsEntities(connectionString))
             {
                 var entity = ProjectEntityConverter.InsertProjectEntity(dbContext.ProjectEntities, project);
                 try
@@ -48,11 +52,11 @@
                 }
                 catch (DataException exception)
                 {
-                    throw CreateUpdateStorageException(Resources.Error_Update_Database, exception);
+                    throw CreateStorageWriterException(Resources.Error_Update_Database, exception);
                 }
                 catch (SystemException exception)
                 {
-                    throw CreateUpdateStorageException(Resources.Error_During_Connection, exception);
+                    throw CreateStorageWriterException(Resources.Error_During_Connection, exception);
                 }
             }
         }
@@ -65,23 +69,23 @@
         /// <returns>Returns the number of changes that were saved in <see cref="RingtoetsEntities"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="project"/> is null.</exception>
         /// <exception cref="System.ArgumentException"><paramref name="databaseFilePath"/> is invalid.</exception>
-        /// <exception cref="StorageValidationException">Thrown when the database does not contain the table <c>version</c>.</exception>
-        /// <exception cref="CouldNotConnectException">Thrown when <paramref name="databaseFilePath"/> does not exist.</exception>
         /// <exception cref="UpdateStorageException">Thrown when
         /// <list type="bullet">
+        /// <item><paramref name="databaseFilePath"/> does not exist.</item>
+        /// <item>The database does not contain the table <c>version</c>.</item>
         /// <item>Saving the <paramref name="project"/> to the database failed.</item>
         /// <item>The connection to the database file failed.</item>
         /// <item>The related entity was not found in the database. Therefore, no update was possible.</item>
         /// </list>
         /// </exception>
         public int SaveProject(string databaseFilePath, Project project)
         {
-            Connect(databaseFilePath);
+            SetConnectionToFile(databaseFilePath);
             if (project == null)
             {
                 throw new ArgumentNullException("project");
             }
-            using (var dbContext = new RingtoetsEntities(ConnectionString))
+            using (var dbContext = new RingtoetsEntities(connectionString))
             {
                 try
                 {
@@ -90,15 +94,15 @@
                 }
                 catch (EntityNotFoundException)
                 {
-                    throw CreateUpdateStorageException(string.Format(Resources.Error_Entity_Not_Found_0_1, "project", project.StorageId));
+                    throw CreateStorageWriterException(string.Format(Resources.Error_Entity_Not_Found_0_1, "project", project.StorageId));
                 }
                 catch (DataException exception)
                 {
-                    throw CreateUpdateStorageException(Resources.Error_Update_Database, exception);
+                    throw CreateStorageWriterException(Resources.Error_Update_Database, exception);
                 }
                 catch (SystemException exception)
                 {
-                    throw CreateUpdateStorageException(Resources.Error_During_Connection, exception);
+                    throw CreateStorageWriterException(Resources.Error_During_Connection, exception);
                 }
             }
         }
@@ -113,61 +117,86 @@
         /// <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))
+            SetConnectionToFile(databaseFilePath);
+            using (var dbContext = new RingtoetsEntities(connectionString))
             {
                 return ProjectEntityConverter.GetProject(dbContext.ProjectEntities);
             }
         }
 
         /// <summary>
-        /// Attempts to connect to existing storage file <paramref name="databaseFilePath"/>.
+        /// Throws a configured instance of <see cref="StorageException"/> when writing to the storage file failed.
         /// </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="StorageException"/>.</returns>
+        private StorageException CreateStorageWriterException(string errorMessage, Exception innerException = null)
+        {
+            var message = new FileWriterErrorMessageBuilder(filePath).Build(errorMessage);
+            return new StorageException(message, innerException);
+        }
+
+        /// <summary>
+        /// Throws a configured instance of <see cref="StorageException"/> when reading the storage file failed.
+        /// </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="StorageException"/>.</returns>
+        private StorageException CreateStorageReaderException(string errorMessage, Exception innerException = null)
+        {
+            var message = new FileReaderErrorMessageBuilder(filePath).Build(errorMessage);
+            return new StorageException(message, innerException);
+        }
+
+        /// <summary>
+        /// Attempts to set the connection to an 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)
+        /// <exception cref="StorageException">Thrown when:<list type="bullet">
+        /// <item><paramref name="databaseFilePath"/> does not exist</item>/// <item>the database does not contain the table <c>version</c>.</item>
+        /// </list>
+        /// </exception>
+        private void SetConnectionToFile(string databaseFilePath)
         {
-            base.Connect(databaseFilePath);
+            FileUtils.ValidateFilePath(databaseFilePath);
+            filePath = databaseFilePath;
 
             if (!File.Exists(databaseFilePath))
             {
-                var message = new FileReaderErrorMessageBuilder(databaseFilePath).Build(UtilsResources.Error_File_does_not_exist);
-                throw new CouldNotConnectException(message);
+                throw CreateStorageReaderException("", new CouldNotConnectException(UtilsResources.Error_File_does_not_exist));
             }
 
-            ConnectionString = SqLiteConnectionStringBuilder.BuildSqLiteEntityConnectionString(databaseFilePath);
+            connectionString = SqLiteConnectionStringBuilder.BuildSqLiteEntityConnectionString(databaseFilePath);
 
             ValidateStorage();
         }
 
         /// <summary>
-        /// Creates a new (empty) Ringtoets database file.
+        /// Sets the connection to a newly created (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)
+        /// <exception cref="UpdateStorageException">Thrown when:<list type="bullet">
+        /// <item><paramref name="databaseFilePath"/> was not created</item>
+        /// <item>executing <c>DatabaseStructure</c> script failed</item>
+        /// <item>the database does not contain the table <c>version</c>.</item>
+        /// </list>
+        /// </exception>
+        private void SetConnectionToNewFile(string databaseFilePath)
         {
-            base.Connect(databaseFilePath);
+            StorageSqliteCreator.CreateDatabaseStructure(databaseFilePath);
 
-            var creator = new StorageSqliteCreator();
-            creator.CreateDatabaseStructure(databaseFilePath);
-
-            Connect(databaseFilePath);
+            SetConnectionToFile(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>
+        /// <exception cref="StorageException">Thrown when the database does not contain the table <c>version</c>.</exception>
         private void ValidateStorage()
         {
-            using (var dbContext = new RingtoetsEntities(ConnectionString))
+            using (var dbContext = new RingtoetsEntities(connectionString))
             {
                 try
                 {
@@ -176,7 +205,7 @@
                 }
                 catch
                 {
-                    throw new StorageValidationException(string.Format(Resources.Error_Validating_Database_0, FilePath));
+                    throw CreateStorageReaderException("", new StorageValidationException(string.Format(Resources.Error_Validating_Database_0, filePath)));
                 }
             }
         }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqliteCreator.cs
===================================================================
diff -u -rf165ef32cdd4f7be892d0433578709272ee7a70e -r985570095b487598c6c2ae93b92e2bce65bf7e90
--- Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqliteCreator.cs	(.../StorageSqliteCreator.cs)	(revision f165ef32cdd4f7be892d0433578709272ee7a70e)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqliteCreator.cs	(.../StorageSqliteCreator.cs)	(revision 985570095b487598c6c2ae93b92e2bce65bf7e90)
@@ -2,30 +2,32 @@
 using System.IO;
 using Application.Ringtoets.Storage.Properties;
 using Core.Common.Base.Storage;
+using Core.Common.Utils;
+using Core.Common.Utils.Builders;
 
 namespace Application.Ringtoets.Storage
 {
     /// <summary>
     /// This class interacts with an empty or new SQLite database file.
     /// </summary>
-    public class StorageSqliteCreator : StorageToDatabaseFile
+    public static class StorageSqliteCreator
     {
         /// <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)
+        /// <exception cref="StorageException">Thrown when executing <c>DatabaseStructure</c> script fails.</exception>
+        public static void CreateDatabaseStructure(string databaseFilePath)
         {
-            Connect(databaseFilePath);
+            FileUtils.ValidateFilePath(databaseFilePath);
 
             if (!File.Exists(databaseFilePath))
             {
                 SQLiteConnection.CreateFile(databaseFilePath);
             }
-            ConnectionString = SqLiteConnectionStringBuilder.BuildSqLiteConnectionString(databaseFilePath);
-            using (var dbContext = new SQLiteConnection(ConnectionString))
+            var connectionString = SqLiteConnectionStringBuilder.BuildSqLiteConnectionString(databaseFilePath);
+            using (var dbContext = new SQLiteConnection(connectionString))
             {
                 using (var command = dbContext.CreateCommand())
                 {
@@ -37,7 +39,8 @@
                     }
                     catch (SQLiteException exception)
                     {
-                        throw CreateUpdateStorageException(Resources.Error_Write_Structure_to_Database, exception);
+                        var message = new FileWriterErrorMessageBuilder(databaseFilePath).Build(Resources.Error_Write_Structure_to_Database);
+                        throw new StorageException(message, new UpdateStorageException("", exception));
                     }
                 }
             }
Fisheye: Tag 985570095b487598c6c2ae93b92e2bce65bf7e90 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/StorageToDatabaseFile.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/StorageSqLiteTest.cs
===================================================================
diff -u -r49bb6b0268c1620312b82ce18ece76fdaf86a195 -r985570095b487598c6c2ae93b92e2bce65bf7e90
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/StorageSqLiteTest.cs	(.../StorageSqLiteTest.cs)	(revision 49bb6b0268c1620312b82ce18ece76fdaf86a195)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/StorageSqLiteTest.cs	(.../StorageSqLiteTest.cs)	(revision 985570095b487598c6c2ae93b92e2bce65bf7e90)
@@ -38,31 +38,38 @@
 
         [Test]
         [TestCase("fileDoesNotExist")]
-        public void LoadProject_NonExistingPath_ThrowsCouldNotConnectException(string nonExistingPath)
+        public void LoadProject_NonExistingPath_ThrowsStorageExceptionAndCouldNotConnectException(string nonExistingPath)
         {
+            // SetUp
+            string expectedMessage = String.Format(@"Fout bij het lezen van bestand '{0}': ", nonExistingPath);
+            string expectedInnerMessage = "Het bestand bestaat niet.";
+
             // Call
             TestDelegate test = () => new StorageSqLite().LoadProject(nonExistingPath);
 
             // Assert
-            CouldNotConnectException exception = Assert.Throws<CouldNotConnectException>(test);
-            string expectedMessage = String.Format(@"Fout bij het lezen van bestand '{0}': Het bestand bestaat niet.", nonExistingPath);
+            StorageException exception = Assert.Throws<StorageException>(test);
+            Assert.IsInstanceOf<Exception>(exception);
+            Assert.IsInstanceOf<CouldNotConnectException>(exception.InnerException);
             Assert.AreEqual(expectedMessage, exception.Message);
+            Assert.AreEqual(expectedInnerMessage, exception.InnerException.Message);
         }
 
         [Test]
         [TestCase("empty.rtd")]
-        public void LoadProject_InvalidRingtoetsFile_ThrowsStorageValidationException(string validPath)
+        public void LoadProject_InvalidRingtoetsFile_ThrowsStorageExceptionAndStorageValidationException(string validPath)
         {
             // Setup
-            var dbFile = Path.Combine(testDataPath, validPath);
+            var tempFile = Path.Combine(testDataPath, validPath);
+            string expectedInnerMessage = String.Format(@"Het bestand '{0}' is geen geldig Ringtoets bestand.", tempFile);
 
             // Call
-            TestDelegate test = () => new StorageSqLite().LoadProject(dbFile);
+            TestDelegate test = () => new StorageSqLite().LoadProject(tempFile);
 
             // Assert
-            StorageValidationException exception = Assert.Throws<StorageValidationException>(test);
-            string expectedMessage = String.Format(@"Het bestand '{0}' is geen geldig Ringtoets bestand.", dbFile);
-            Assert.AreEqual(expectedMessage, exception.Message);
+            StorageException exception = Assert.Throws<StorageException>(test);
+            Assert.IsInstanceOf<StorageValidationException>(exception.InnerException);
+            Assert.AreEqual(expectedInnerMessage, exception.InnerException.Message);
         }
 
         [Test]
@@ -160,23 +167,24 @@
         {
             // Setup
             var tempFile = Path.Combine(testDataPath, "tempProjectFile.rtd");
+            string expectedMessage = String.Format(@"Fout bij het schrijven naar bestand '{0}': Een fout is opgetreden met schrijven naar het nieuwe Ringtoets bestand.", tempFile);
             var project = new Project();
             var storage = new StorageSqLite();
 
             // Call
             TestDelegate test = () => storage.SaveProjectAs(tempFile, project);
 
-            // Assert
-            UpdateStorageException updateStorageException;
+            StorageException exception;
             using (File.Create(tempFile)) // Locks file
             {
-                updateStorageException = Assert.Throws<UpdateStorageException>(test);
+                exception = Assert.Throws<StorageException>(test);
             }
-            string expectedMessage = String.Format("Fout bij het schrijven naar bestand '{0}': {1}",
-                                                   tempFile,
-                                                   "Een fout is opgetreden met schrijven naar het nieuwe Ringtoets bestand.");
-            Assert.AreEqual(expectedMessage, updateStorageException.Message);
 
+            // Assert
+            Assert.IsInstanceOf<Exception>(exception);
+            Assert.IsInstanceOf<UpdateStorageException>(exception.InnerException);
+            Assert.AreEqual(expectedMessage, exception.Message);
+
             // Tear Down
             TearDownTempRingtoetsFile(tempFile);
         }
@@ -218,22 +226,25 @@
         {
             // Setup
             var tempFile = Path.Combine(testDataPath, "tempProjectFile.rtd");
+            string expectedMessage = String.Format(@"Fout bij het lezen van bestand '{0}': ", tempFile);
+            string expectedInnerMessage = "Het bestand bestaat niet.";
             var storage = new StorageSqLite();
 
             // Call
             TestDelegate test = () => storage.SaveProject(tempFile, null);
 
             // Assert
-            CouldNotConnectException exception = Assert.Throws<CouldNotConnectException>(test);
-            string expectedMessage = String.Format(@"Fout bij het lezen van bestand '{0}': Het bestand bestaat niet.", tempFile);
+            StorageException exception = Assert.Throws<StorageException>(test);
             Assert.AreEqual(expectedMessage, exception.Message);
+            Assert.IsInstanceOf<CouldNotConnectException>(exception.InnerException);
+            Assert.AreEqual(expectedInnerMessage, exception.InnerException.Message);
 
             // Tear Down
             TearDownTempRingtoetsFile(tempFile);
         }
 
         [Test]
-        public void SaveProject_EmptyDatabaseFile_ThrowsUpdateStorageException()
+        public void SaveProject_EmptyDatabaseFile_ThrowsStorageException()
         {
             // Setup
             var project = new Project
@@ -247,7 +258,7 @@
             TestDelegate test = () => storage.SaveProject(tempFile, project);
 
             // Assert
-            UpdateStorageException exception = Assert.Throws<UpdateStorageException>(test);
+            StorageException exception = Assert.Throws<StorageException>(test);
             string expectedMessage = String.Format(@"Fout bij het schrijven naar bestand '{0}'{1}: {2}", tempFile, "",
                                                    String.Format("Het object '{0}' met id '{1}' is niet gevonden.", "project", project.StorageId));
             Assert.AreEqual(expectedMessage, exception.Message);
Index: Core/Common/src/Core.Common.Base/Core.Common.Base.csproj
===================================================================
diff -u -rbcbae879035d5472efff973990ba1194e38b2ea5 -r985570095b487598c6c2ae93b92e2bce65bf7e90
--- Core/Common/src/Core.Common.Base/Core.Common.Base.csproj	(.../Core.Common.Base.csproj)	(revision bcbae879035d5472efff973990ba1194e38b2ea5)
+++ Core/Common/src/Core.Common.Base/Core.Common.Base.csproj	(.../Core.Common.Base.csproj)	(revision 985570095b487598c6c2ae93b92e2bce65bf7e90)
@@ -84,6 +84,7 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="IO\ProgressChangedDelegate.cs" />
+    <Compile Include="Storage\StorageException.cs" />
     <Compile Include="Storage\StorageValidationException.cs" />
     <Compile Include="Storage\CouldNotConnectException.cs" />
     <Compile Include="Storage\IStoreProject.cs" />
Index: Core/Common/src/Core.Common.Base/Storage/IStoreProject.cs
===================================================================
diff -u -r85053cd7be8aa42587cc2b0e25d6b98b5a5c2893 -r985570095b487598c6c2ae93b92e2bce65bf7e90
--- Core/Common/src/Core.Common.Base/Storage/IStoreProject.cs	(.../IStoreProject.cs)	(revision 85053cd7be8aa42587cc2b0e25d6b98b5a5c2893)
+++ Core/Common/src/Core.Common.Base/Storage/IStoreProject.cs	(.../IStoreProject.cs)	(revision 985570095b487598c6c2ae93b92e2bce65bf7e90)
@@ -15,22 +15,31 @@
         /// <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
+        /// <exception cref="StorageException">Thrown when
         /// <list type="bullet">
+        /// <item>No new storage was created.</item>
+        /// <item>The storage is no valid Ringtoets project.</item>
         /// <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>
-        /// 
+        /// Converts <paramref name="project"/> to an existing entity in the storage.
         /// </summary>
         /// <param name="connectionArguments"></param>
-        /// <param name="project"></param>
-        /// <returns></returns>
+        /// <param name="project">The <see cref="Project"/> to save.</param>
+        /// <returns>Returns the number of changes that were saved.</returns>
+        /// <exception cref="StorageException">Thrown when
+        /// <list type="bullet">
+        /// <item><paramref name="connectionArguments"/> does not exist.</item>
+        /// <item>The storage is no valid Ringtoets project.</item>
+        /// <item>Saving the <paramref name="project"/> to the storage failed.</item>
+        /// <item>The connection to the storage failed.</item>
+        /// <item>The related entity was not found in the storage. Therefore, no update was possible.</item>
+        /// </list>
+        /// </exception>
         int SaveProject(string connectionArguments, Project project);
 
         /// <summary>
@@ -44,4 +53,4 @@
         /// <exception cref="StorageValidationException">Thrown when the storage is no valid Ringtoets project.</exception>
         Project LoadProject(string connectionArguments);
     }
-}
+}
\ No newline at end of file
Index: Core/Common/src/Core.Common.Base/Storage/StorageException.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Base/Storage/StorageException.cs	(revision 0)
+++ Core/Common/src/Core.Common.Base/Storage/StorageException.cs	(revision 985570095b487598c6c2ae93b92e2bce65bf7e90)
@@ -0,0 +1,32 @@
+using System;
+
+namespace Core.Common.Base.Storage
+{
+    /// <summary>
+    /// The exception that is thrown when a storage execution failed.
+    /// </summary>
+    public class StorageException : Exception
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StorageException"/> class.
+        /// </summary>
+        public StorageException() {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StorageException"/> class
+        /// with a specified error message.
+        /// </summary>
+        /// <param name="message">The error message that explains the reason for the exception.</param>
+        public StorageException(string message) : base(message) {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StorageException"/> 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 StorageException(string message, Exception inner) : base(message, inner) {}
+    }
+}
\ No newline at end of file
Index: Core/Common/src/Core.Common.Gui/StorageCommandHandler.cs
===================================================================
diff -u -rf165ef32cdd4f7be892d0433578709272ee7a70e -r985570095b487598c6c2ae93b92e2bce65bf7e90
--- Core/Common/src/Core.Common.Gui/StorageCommandHandler.cs	(.../StorageCommandHandler.cs)	(revision f165ef32cdd4f7be892d0433578709272ee7a70e)
+++ Core/Common/src/Core.Common.Gui/StorageCommandHandler.cs	(.../StorageCommandHandler.cs)	(revision 985570095b487598c6c2ae93b92e2bce65bf7e90)
@@ -91,24 +91,12 @@
             {
                 loadedProject = storage.LoadProject(filePath);
             }
-            catch (ArgumentException e)
+            catch (StorageException e)
             {
-                log.Warn(e.Message);
+                log.Warn(e.Message, e.InnerException);
                 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_existing_project_opening_failed);
-                return false;
-            }
 
             if (loadedProject == null)
             {
@@ -245,13 +233,9 @@
                 storage.SaveProjectAs(filePath, gui.Project);
                 return true;
             }
-            catch (Exception e)
+            catch (StorageException e)
             {
-                if (!(e is ArgumentException || e is CouldNotConnectException || e is StorageValidationException || e is UpdateStorageException))
-                {
-                    throw;
-                }
-                log.Warn(e.Message);
+                log.Warn(e.Message, e.InnerException);
                 log.Warn(Resources.Project_saving_project_failed);
                 return false;
             }
@@ -264,13 +248,9 @@
                 storage.SaveProject(filePath, gui.Project);
                 return true;
             }
-            catch (Exception e)
+            catch (StorageException e)
             {
-                if (!(e is ArgumentException || e is CouldNotConnectException || e is StorageValidationException || e is UpdateStorageException))
-                {
-                    throw;
-                }
-                log.Warn(e.Message);
+                log.Warn(e.Message, e.InnerException);
                 log.Warn(Resources.Project_saving_project_failed);
                 return false;
             }
Index: Core/Common/test/Core.Common.Base.Test/Core.Common.Base.Test.csproj
===================================================================
diff -u -rbcbae879035d5472efff973990ba1194e38b2ea5 -r985570095b487598c6c2ae93b92e2bce65bf7e90
--- Core/Common/test/Core.Common.Base.Test/Core.Common.Base.Test.csproj	(.../Core.Common.Base.Test.csproj)	(revision bcbae879035d5472efff973990ba1194e38b2ea5)
+++ Core/Common/test/Core.Common.Base.Test/Core.Common.Base.Test.csproj	(.../Core.Common.Base.Test.csproj)	(revision 985570095b487598c6c2ae93b92e2bce65bf7e90)
@@ -86,6 +86,7 @@
     <Compile Include="Data\ProjectTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Service\FileImportActivityTest.cs" />
+    <Compile Include="Storage\StorageExceptionTest.cs" />
     <Compile Include="Storage\StorageValidationExceptionTest.cs" />
     <Compile Include="Storage\CouldNotConnectExceptionTest.cs" />
     <Compile Include="Storage\UpdateStorageExceptionTest.cs" />
Index: Core/Common/test/Core.Common.Base.Test/Storage/StorageExceptionTest.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.Base.Test/Storage/StorageExceptionTest.cs	(revision 0)
+++ Core/Common/test/Core.Common.Base.Test/Storage/StorageExceptionTest.cs	(revision 985570095b487598c6c2ae93b92e2bce65bf7e90)
@@ -0,0 +1,54 @@
+using System;
+using Core.Common.Base.Storage;
+using NUnit.Framework;
+
+namespace Core.Common.Base.Test.Storage
+{
+    [TestFixture]
+    public class StorageExceptionTest
+    {
+        [Test]
+        public void DefaultConstructor_InnerExceptionNullAndMessageDefault()
+        {
+            // Setup
+            string expectedMessage = String.Format("Exception of type '{0}' was thrown.", typeof(StorageException).FullName);
+
+            // Call
+            StorageException exception = new StorageException();
+
+            // Assert
+            Assert.IsInstanceOf<Exception>(exception);
+            Assert.IsNull(exception.InnerException);
+            Assert.AreEqual(expectedMessage, exception.Message);
+        }
+
+        [Test]
+        public void Constructor_WithCustomMessage_InnerExceptionNullAndMessageSetToCustom()
+        {
+            // Setup
+            const string expectedMessage = "Some exception message";
+
+            // Call
+            StorageException exception = new StorageException(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
+            StorageException exception = new StorageException(expectedMessage, expectedInnerException);
+
+            // Assert
+            Assert.AreSame(expectedInnerException, exception.InnerException);
+            Assert.AreEqual(expectedMessage, exception.Message);
+        }
+    }
+}
\ No newline at end of file