Index: Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs
===================================================================
diff -u -r85053cd7be8aa42587cc2b0e25d6b98b5a5c2893 -rf959ca1b291dc2a31bc7cf52990657b345548a95
--- Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 85053cd7be8aa42587cc2b0e25d6b98b5a5c2893)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision f959ca1b291dc2a31bc7cf52990657b345548a95)
@@ -1795,7 +1795,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Openen van bestaand Ringtoets project..
+        ///   Looks up a localized string similar to Openen van bestaand Ringtoetsproject..
         /// </summary>
         public static string Project_existing_opening_project {
             get {
@@ -1804,7 +1804,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Openen van bestaand Ringtoets project geannuleerd..
+        ///   Looks up a localized string similar to Openen van bestaand Ringtoetsproject geannuleerd..
         /// </summary>
         public static string Project_existing_project_opening_cancelled {
             get {
@@ -1813,7 +1813,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Het is niet gelukt om het Ringtoets project te laden..
+        ///   Looks up a localized string similar to Het is niet gelukt om het Ringtoetsproject te laden..
         /// </summary>
         public static string Project_existing_project_opening_failed {
             get {
@@ -1822,7 +1822,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Bestaand Ringtoets project succesvol geopend..
+        ///   Looks up a localized string similar to Bestaand Ringtoetsproject succesvol geopend..
         /// </summary>
         public static string Project_existing_successfully_opened {
             get {
@@ -1831,7 +1831,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Openen van nieuw Ringtoets project..
+        ///   Looks up a localized string similar to Openen van nieuw Ringtoetsproject..
         /// </summary>
         public static string Project_new_opening {
             get {
@@ -1840,7 +1840,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Openen van nieuw Ringtoets project geannuleerd..
+        ///   Looks up a localized string similar to Openen van nieuw Ringtoetsproject geannuleerd..
         /// </summary>
         public static string Project_new_opening_cancelled {
             get {
@@ -1849,7 +1849,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Nieuw Ringtoets project succesvol geopend..
+        ///   Looks up a localized string similar to Nieuw Ringtoetsproject succesvol geopend..
         /// </summary>
         public static string Project_new_successfully_opened {
             get {
@@ -1858,25 +1858,16 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Opslaan van het Ringtoets project..
+        ///   Looks up a localized string similar to Opslaan van het Ringtoetsproject geannuleerd..
         /// </summary>
-        public static string Project_saving_project {
-            get {
-                return ResourceManager.GetString("Project_saving_project", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Opslaan van het Ringtoets project geannuleerd..
-        /// </summary>
         public static string Project_saving_project_cancelled {
             get {
                 return ResourceManager.GetString("Project_saving_project_cancelled", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Het is niet gelukt om het Ringtoets project op te slaan..
+        ///   Looks up a localized string similar to Het is niet gelukt om het Ringtoetsproject op te slaan..
         /// </summary>
         public static string Project_saving_project_failed {
             get {
@@ -1885,11 +1876,11 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Het Ringtoets project succesvol opgeslagen..
+        ///   Looks up a localized string similar to Het Ringtoetsproject &apos;{0}&apos; is succesvol opgeslagen..
         /// </summary>
-        public static string Project_saving_project_saved {
+        public static string Project_saving_project_saved_0 {
             get {
-                return ResourceManager.GetString("Project_saving_project_saved", resourceCulture);
+                return ResourceManager.GetString("Project_saving_project_saved_0", resourceCulture);
             }
         }
         
@@ -2253,7 +2244,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Ringtoets project files (.rtd)|*.rtd.
+        ///   Looks up a localized string similar to Ringtoetsproject (*.rtd)|*.rtd.
         /// </summary>
         public static string Ringtoets_project_file_filter {
             get {
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.resx
===================================================================
diff -u -r85053cd7be8aa42587cc2b0e25d6b98b5a5c2893 -rf959ca1b291dc2a31bc7cf52990657b345548a95
--- Core/Common/src/Core.Common.Gui/Properties/Resources.resx	(.../Resources.resx)	(revision 85053cd7be8aa42587cc2b0e25d6b98b5a5c2893)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.resx	(.../Resources.resx)	(revision f959ca1b291dc2a31bc7cf52990657b345548a95)
@@ -143,7 +143,7 @@
     <value>..\Resources\RelationshipsHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Project_new_opening_cancelled" xml:space="preserve">
-    <value>Openen van nieuw Ringtoets project geannuleerd.</value>
+    <value>Openen van nieuw Ringtoetsproject geannuleerd.</value>
   </data>
   <data name="information_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\information_32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -191,7 +191,7 @@
     <value>..\Resources\ClosePreviewHH.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Ringtoets_project_file_filter" xml:space="preserve">
-    <value>Ringtoets project files (.rtd)|*.rtd</value>
+    <value>Ringtoetsproject (*.rtd)|*.rtd</value>
   </data>
   <data name="PortableSettingsProvider_SetPropertyValues_Error_storing_settings_to_0_" xml:space="preserve">
     <value>Fout bij het opslaan van de instellingen in {0}.</value>
@@ -305,7 +305,7 @@
     <value>..\Resources\saveHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Project_existing_project_opening_cancelled" xml:space="preserve">
-    <value>Openen van bestaand Ringtoets project geannuleerd.</value>
+    <value>Openen van bestaand Ringtoetsproject geannuleerd.</value>
   </data>
   <data name="graphhs" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\graphhs.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -410,7 +410,7 @@
     <value>Berichten</value>
   </data>
   <data name="Project_new_successfully_opened" xml:space="preserve">
-    <value>Nieuw Ringtoets project succesvol geopend.</value>
+    <value>Nieuw Ringtoetsproject succesvol geopend.</value>
   </data>
   <data name="brick1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\brick1.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -542,7 +542,7 @@
     <value>Menu's en werkbalken instellen...</value>
   </data>
   <data name="Project_new_opening" xml:space="preserve">
-    <value>Openen van nieuw Ringtoets project.</value>
+    <value>Openen van nieuw Ringtoetsproject.</value>
   </data>
   <data name="chart_bar" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\chart_bar.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -623,7 +623,7 @@
     <value>Eigenschappen</value>
   </data>
   <data name="Project_existing_opening_project" xml:space="preserve">
-    <value>Openen van bestaand Ringtoets project.</value>
+    <value>Openen van bestaand Ringtoetsproject.</value>
   </data>
   <data name="brick" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>../Resources/brick.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -941,21 +941,18 @@
     <value>Slechts één DynamicVisibleValidationMethod toegestaan per klasse: {0}.</value>
   </data>
   <data name="Project_existing_project_opening_failed" xml:space="preserve">
-    <value>Het is niet gelukt om het Ringtoets project te laden.</value>
+    <value>Het is niet gelukt om het Ringtoetsproject te laden.</value>
   </data>
   <data name="Project_existing_successfully_opened" xml:space="preserve">
-    <value>Bestaand Ringtoets project succesvol geopend.</value>
+    <value>Bestaand Ringtoetsproject succesvol geopend.</value>
   </data>
-  <data name="Project_saving_project" xml:space="preserve">
-    <value>Opslaan van het Ringtoets project.</value>
-  </data>
   <data name="Project_saving_project_cancelled" xml:space="preserve">
-    <value>Opslaan van het Ringtoets project geannuleerd.</value>
+    <value>Opslaan van het Ringtoetsproject geannuleerd.</value>
   </data>
   <data name="Project_saving_project_failed" xml:space="preserve">
-    <value>Het is niet gelukt om het Ringtoets project op te slaan.</value>
+    <value>Het is niet gelukt om het Ringtoetsproject op te slaan.</value>
   </data>
-  <data name="Project_saving_project_saved" xml:space="preserve">
-    <value>Het Ringtoets project succesvol opgeslagen.</value>
+  <data name="Project_saving_project_saved_0" xml:space="preserve">
+    <value>Het Ringtoetsproject '{0}' is succesvol opgeslagen.</value>
   </data>
 </root>
\ No newline at end of file
Index: Core/Common/src/Core.Common.Gui/StorageCommandHandler.cs
===================================================================
diff -u -r8455cc72c8d0bc1b1dc0a0d3987b54c0ddcb292d -rf959ca1b291dc2a31bc7cf52990657b345548a95
--- Core/Common/src/Core.Common.Gui/StorageCommandHandler.cs	(.../StorageCommandHandler.cs)	(revision 8455cc72c8d0bc1b1dc0a0d3987b54c0ddcb292d)
+++ Core/Common/src/Core.Common.Gui/StorageCommandHandler.cs	(.../StorageCommandHandler.cs)	(revision f959ca1b291dc2a31bc7cf52990657b345548a95)
@@ -1,13 +1,11 @@
 using System;
 using System.IO;
 using System.Windows.Forms;
-
 using Core.Common.Base;
 using Core.Common.Base.Data;
 using Core.Common.Base.Storage;
 using Core.Common.Controls.Views;
 using Core.Common.Gui.Properties;
-
 using log4net;
 
 namespace Core.Common.Gui
@@ -36,6 +34,14 @@
             this.gui.ProjectClosing += ApplicationProjectClosing;
         }
 
+        public void UpdateObserver()
+        {
+            gui.RefreshGui();
+        }
+
+        /// <summary>
+        /// Closes the current <see cref="Project"/> and creates a new (empty) <see cref="Project"/>.
+        /// </summary>
         public void CreateNewProject()
         {
             CloseProject();
@@ -150,7 +156,6 @@
                 return false;
             }
 
-            log.Info(Resources.Project_saving_project);
             // show file open dialog and select project file
             var saveFileDialog = new SaveFileDialog
             {
@@ -168,39 +173,17 @@
 
             var filePath = saveFileDialog.FileName;
             var storage = gui.Storage;
-            try
+            if (!TrySaveProjectAs(storage, filePath))
             {
-                storage.SaveProjectAs(filePath, gui.Project);
-            }
-            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;
             project.Name = Path.GetFileNameWithoutExtension(filePath);
-            log.Info(Resources.Project_saving_project_saved);
+            project.NotifyObservers();
+            gui.RefreshGui();
+            log.Info(String.Format(Resources.Project_saving_project_saved_0, project.Name));
             return true;
         }
 
@@ -223,52 +206,60 @@
                 return SaveProjectAs();
             }
 
-            log.Info(Resources.Project_saving_project);
             var storage = gui.Storage;
-            try
+            if (!TrySaveProject(storage, filePath))
             {
-                storage.SaveProject(filePath, gui.Project);
+                return false;
             }
-            catch (ArgumentException e)
+
+            log.Info(String.Format(Resources.Project_saving_project_saved_0, project.Name));
+            return true;
+        }
+
+        public void Dispose()
+        {
+            gui.ProjectOpened -= ApplicationProjectOpened;
+            gui.ProjectClosing -= ApplicationProjectClosing;
+        }
+
+        private bool TrySaveProjectAs(IStoreProject storage, string filePath)
+        {
+            try
             {
-                log.Warn(e.Message);
-                log.Warn(Resources.Project_saving_project_failed);
-                return false;
+                storage.SaveProjectAs(filePath, gui.Project);
+                return true;
             }
-            catch (CouldNotConnectException e)
+            catch (Exception e)
             {
+                if (!(e is ArgumentException || e is CouldNotConnectException || e is StorageValidationException || e is UpdateStorageException))
+                {
+                    throw;
+                }
                 log.Warn(e.Message);
                 log.Warn(Resources.Project_saving_project_failed);
                 return false;
             }
-            catch (StorageValidationException e)
+        }
+
+        private bool TrySaveProject(IStoreProject storage, string filePath)
+        {
+            try
             {
-                log.Warn(e.Message);
-                log.Warn(Resources.Project_saving_project_failed);
-                return false;
+                storage.SaveProject(filePath, gui.Project);
+                return true;
             }
-            catch (UpdateStorageException e)
+            catch (Exception e)
             {
+                if (!(e is ArgumentException || e is CouldNotConnectException || e is StorageValidationException || e is UpdateStorageException))
+                {
+                    throw;
+                }
                 log.Warn(e.Message);
                 log.Warn(Resources.Project_saving_project_failed);
                 return false;
             }
-
-            log.Info(Resources.Project_saving_project_saved);
-            return true;
         }
 
-        public void UpdateObserver()
-        {
-            gui.RefreshGui();
-        }
-
-        public void Dispose()
-        {
-            gui.ProjectOpened -= ApplicationProjectOpened;
-            gui.ProjectClosing -= ApplicationProjectClosing;
-        }
-
         private void ApplicationProjectClosing(Project project)
         {
             // clean all views