Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
===================================================================
diff -u -r3a8bff057967bdb42389382472f6ce55789a0ced -r8404b9bd4e87e4a097a982ddccba6ecfa5aeec32
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision 3a8bff057967bdb42389382472f6ce55789a0ced)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision 8404b9bd4e87e4a097a982ddccba6ecfa5aeec32)
@@ -41,7 +41,6 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data.SQLite, Version=1.0.99.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\System.Data.SQLite.Core.1.0.99.0\lib\net40\System.Data.SQLite.dll</HintPath>
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Ringtoets.rt
===================================================================
diff -u -r3a8bff057967bdb42389382472f6ce55789a0ced -r8404b9bd4e87e4a097a982ddccba6ecfa5aeec32
Binary files differ
Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs
===================================================================
diff -u -r3a8bff057967bdb42389382472f6ce55789a0ced -r8404b9bd4e87e4a097a982ddccba6ecfa5aeec32
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision 3a8bff057967bdb42389382472f6ce55789a0ced)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision 8404b9bd4e87e4a097a982ddccba6ecfa5aeec32)
@@ -529,7 +529,7 @@
             {
                 try
                 {
-                    Gui.CommandHandler.TryOpenExistingProject(path);
+                    Gui.CommandHandler.OpenExistingProject(path);
                     RecentProjectsTabControl.Items.Remove(newItem);
                     RecentProjectsTabControl.Items.Insert(1, newItem);
                 }
@@ -653,7 +653,7 @@
 
         private void OnFileOpenClicked(object sender, RoutedEventArgs e)
         {
-            var succesful = Gui.CommandHandler.TryOpenExistingProject();
+            var succesful = Gui.CommandHandler.OpenExistingProject();
             OnAfterProjectSaveOrOpen(succesful);
         }
 
@@ -662,14 +662,14 @@
             //TODO: Implement
 
             // Original code:
-            //Gui.CommandHandler.TryCloseProject();
+            //Gui.CommandHandler.CloseProject();
             //ValidateItems();
         }
 
         private void OnFileNewClicked(object sender, RoutedEventArgs e)
         {
             // Original code:
-            Gui.CommandHandler.TryCreateNewProject();
+            Gui.CommandHandler.CreateNewProject();
             ValidateItems();
         }
 
Index: Core/Common/src/Core.Common.Gui/GuiCommandHandler.cs
===================================================================
diff -u -r3a8bff057967bdb42389382472f6ce55789a0ced -r8404b9bd4e87e4a097a982ddccba6ecfa5aeec32
--- Core/Common/src/Core.Common.Gui/GuiCommandHandler.cs	(.../GuiCommandHandler.cs)	(revision 3a8bff057967bdb42389382472f6ce55789a0ced)
+++ Core/Common/src/Core.Common.Gui/GuiCommandHandler.cs	(.../GuiCommandHandler.cs)	(revision 8404b9bd4e87e4a097a982ddccba6ecfa5aeec32)
@@ -42,17 +42,17 @@
             guiExportHandler = CreateGuiExportHandler();
         }
 
-        public void TryCreateNewProject()
+        public void CreateNewProject()
         {
-            if (!TryCloseProject())
+            if (!CloseProject())
             {
-                Log.Warn(Resources.Opening_new_project_cancelled);
+                Log.Warn(Resources.Project_new_opening_cancelled);
                 return;
             }
 
-            Log.Info(Resources.Opening_new_project);
+            Log.Info(Resources.Project_new_opening);
             gui.Project = new Project();
-            Log.Info(Resources.New_project_successfully_opened);
+            Log.Info(Resources.Project_new_successfully_opened);
 
             RefreshGui();
         }
@@ -61,7 +61,7 @@
         /// Opens a new <see cref="OpenFileDialog"/> where a file can be selected to open.
         /// </summary>
         /// <returns><c>true</c> if an existing <see cref="Project"/> has been loaded, <c>false</c> otherwise.</returns>
-        public bool TryOpenExistingProject()
+        public bool OpenExistingProject()
         {
             var openFileDialog = new OpenFileDialog
             {
@@ -72,9 +72,9 @@
 
             if (openFileDialog.ShowDialog(gui.MainWindow) != DialogResult.Cancel)
             {
-                return TryOpenExistingProject(openFileDialog.FileName);
+                return OpenExistingProject(openFileDialog.FileName);
             }
-            Log.Warn(Resources.Opening_existing_project_cancelled);
+            Log.Warn(Resources.Project_existing_project_opening_cancelled);
             return false;
         }
 
@@ -83,43 +83,40 @@
         /// </summary>
         /// <param name="filePath">Location of the storage file.</param>
         /// <returns><c>true</c> if an existing <see cref="Project"/> has been loaded, <c>false</c> otherwise.</returns>
-        public bool TryOpenExistingProject(string filePath)
+        public bool OpenExistingProject(string filePath)
         {
-            Log.Info(Resources.Opening_existing_project);
-
+            Log.Info(Resources.Project_existing_opening_project);
             var storage = new StorageSqLite(filePath);
             if (!storage.TestConnection())
             {
-                Log.Warn(Resources.Opening_existing_project_failed);
+                Log.Warn(Resources.Project_existing_project_opening_failed);
                 return false;
             }
-            var projectFromStorage = storage.LoadProject();
-            if (projectFromStorage == null)
-            {
-                Log.Warn(Resources.Opening_existing_project_failed);
-                return false;
-            }
 
             // Project loaded successfully, close current project
-            if (!TryCloseProject())
+            if (!CloseProject())
             {
-                Log.Warn(Resources.Opening_existing_project_cancelled);
+                Log.Warn(Resources.Project_existing_project_opening_cancelled);
                 return false;
             }
+            
             gui.ProjectFilePath = filePath;
-            gui.Project = projectFromStorage;
+            gui.Project = storage.LoadProject();
+            if (gui.Project == null)
+            {
+                Log.Warn(Resources.Project_existing_project_opening_failed);
+                return false;
+            }
 
             RefreshGui();
-            Log.Info(Resources.Opening_existing_project);
+            Log.Info(Resources.Project_existing_successfully_opened);
             return true;
         }
 
-        public bool TryCloseProject()
+        public bool CloseProject()
         {
             if (gui.Project != null)
             {
-                Log.Info(Resources.GuiCommandHandler_TryCloseProject_Closing_current_project);
-
                 // DO NOT REMOVE CODE BELOW. If the views are not cleaned up here we access disposable stuff like in issue 4161.
                 // SO VIEWS SHOULD ALWAYS BE CLOSED!
                 // remove views before closing project. 
@@ -131,8 +128,6 @@
                 gui.Project = null;
 
                 RefreshGui();
-
-                Log.Info(Resources.GuiCommandHandler_CloseProject_Project_closed);
             }
 
             return true;
Index: Core/Common/src/Core.Common.Gui/IGuiCommandHandler.cs
===================================================================
diff -u -r3a8bff057967bdb42389382472f6ce55789a0ced -r8404b9bd4e87e4a097a982ddccba6ecfa5aeec32
--- Core/Common/src/Core.Common.Gui/IGuiCommandHandler.cs	(.../IGuiCommandHandler.cs)	(revision 3a8bff057967bdb42389382472f6ce55789a0ced)
+++ Core/Common/src/Core.Common.Gui/IGuiCommandHandler.cs	(.../IGuiCommandHandler.cs)	(revision 8404b9bd4e87e4a097a982ddccba6ecfa5aeec32)
@@ -16,40 +16,40 @@
         bool SaveProject();
 
         /// <summary>
-        /// Tries to create a new project.
+        /// Creates a new project.
         /// </summary>
         /// <remarks>
         /// The creation action might be cancelled (due to user interaction).
         /// </remarks>
-        void TryCreateNewProject();
+        void CreateNewProject();
 
         /// <summary>
-        /// Tries to open an existing project.
+        /// Opens an existing project.
         /// </summary>
         /// <remarks>
         /// The opening action might be cancelled (due to user interaction).
         /// </remarks>
         /// <returns>Whether or not an existing project was correctly opened.</returns>
-        bool TryOpenExistingProject();
+        bool OpenExistingProject();
 
         /// <summary>
-        /// Tries to open an existing project from file.
+        /// Opens an existing project from file.
         /// </summary>
         /// <param name="filePath">The path to the existing project file.</param>
         /// <remarks>
         /// The opening action might be cancelled (due to user interaction).
         /// </remarks>
         /// <returns>Whether or not an existing project was correctly opened.</returns>
-        bool TryOpenExistingProject(string filePath);
+        bool OpenExistingProject(string filePath);
 
         /// <summary>
-        /// Tries to close a project.
+        /// Closes a project.
         /// </summary>
         /// <remarks>
         /// The closing action might be cancelled (due to user interaction).
         /// </remarks>
         /// <returns>Whether or not the project was correctly closed.</returns>
-        bool TryCloseProject();
+        bool CloseProject();
 
         /// <summary>
         /// Presents the user with a dialog to choose an editor for the selected dataitem
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs
===================================================================
diff -u -r3a8bff057967bdb42389382472f6ce55789a0ced -r8404b9bd4e87e4a097a982ddccba6ecfa5aeec32
--- Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 3a8bff057967bdb42389382472f6ce55789a0ced)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 8404b9bd4e87e4a097a982ddccba6ecfa5aeec32)
@@ -1193,15 +1193,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Project is gesloten..
-        /// </summary>
-        public static string GuiCommandHandler_CloseProject_Project_closed {
-            get {
-                return ResourceManager.GetString("GuiCommandHandler_CloseProject_Project_closed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Kan niet importeren naar {0}..
         /// </summary>
         public static string GuiCommandHandler_ImportOn_Unable_to_import_on_0_ {
@@ -1230,15 +1221,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Sluiten van huidig project..
-        /// </summary>
-        public static string GuiCommandHandler_TryCloseProject_Closing_current_project {
-            get {
-                return ResourceManager.GetString("GuiCommandHandler_TryCloseProject_Closing_current_project", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Kan geen &apos;GuiCommandHandler&apos;-afhankelijk element in het contextmenu creëren zonder een &apos;GuiCommandHandler&apos;..
         /// </summary>
         public static string GuiContextMenuItemFactory_Can_not_create_gui_context_menu_items_without_gui {
@@ -1610,15 +1592,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Nieuw project succesvol geopend..
-        /// </summary>
-        public static string New_project_successfully_opened {
-            get {
-                return ResourceManager.GetString("New_project_successfully_opened", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         public static System.Drawing.Bitmap newspaper {
@@ -1695,51 +1668,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Openen van bestaand Ringtoets project..
-        /// </summary>
-        public static string Opening_existing_project {
-            get {
-                return ResourceManager.GetString("Opening_existing_project", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Openen van bestaand Ringtoets project geannuleerd..
-        /// </summary>
-        public static string Opening_existing_project_cancelled {
-            get {
-                return ResourceManager.GetString("Opening_existing_project_cancelled", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Het is niet gelukt om het Ringtoets project te laden..
-        /// </summary>
-        public static string Opening_existing_project_failed {
-            get {
-                return ResourceManager.GetString("Opening_existing_project_failed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Openen van nieuw Ringtoets project..
-        /// </summary>
-        public static string Opening_new_project {
-            get {
-                return ResourceManager.GetString("Opening_new_project", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Openen van nieuw Ringtoets project geannuleerd..
-        /// </summary>
-        public static string Opening_new_project_cancelled {
-            get {
-                return ResourceManager.GetString("Opening_new_project_cancelled", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         public static System.Drawing.Bitmap OptionsHS {
@@ -1877,6 +1805,69 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Openen van bestaand Ringtoets project..
+        /// </summary>
+        public static string Project_existing_opening_project {
+            get {
+                return ResourceManager.GetString("Project_existing_opening_project", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Openen van bestaand Ringtoets project geannuleerd..
+        /// </summary>
+        public static string Project_existing_project_opening_cancelled {
+            get {
+                return ResourceManager.GetString("Project_existing_project_opening_cancelled", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Het is niet gelukt om het Ringtoets project te laden..
+        /// </summary>
+        public static string Project_existing_project_opening_failed {
+            get {
+                return ResourceManager.GetString("Project_existing_project_opening_failed", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Bestaand Ringtoets project succesvol geopend..
+        /// </summary>
+        public static string Project_existing_successfully_opened {
+            get {
+                return ResourceManager.GetString("Project_existing_successfully_opened", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Openen van nieuw Ringtoets project..
+        /// </summary>
+        public static string Project_new_opening {
+            get {
+                return ResourceManager.GetString("Project_new_opening", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Openen van nieuw Ringtoets project geannuleerd..
+        /// </summary>
+        public static string Project_new_opening_cancelled {
+            get {
+                return ResourceManager.GetString("Project_new_opening_cancelled", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Nieuw Ringtoets project succesvol geopend..
+        /// </summary>
+        public static string Project_new_successfully_opened {
+            get {
+                return ResourceManager.GetString("Project_new_successfully_opened", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Er ging iets fout bij het ophalen van de &apos;NodePresenters&apos; van alle plugins..
         /// </summary>
         public static string ProjectExplorerGuiPlugin_FillProjectTreeViewNodePresentersFromPlugins_Could_not_retrieve_NodePresenters_for_a_plugin {
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.resx
===================================================================
diff -u -r3a8bff057967bdb42389382472f6ce55789a0ced -r8404b9bd4e87e4a097a982ddccba6ecfa5aeec32
--- Core/Common/src/Core.Common.Gui/Properties/Resources.resx	(.../Resources.resx)	(revision 3a8bff057967bdb42389382472f6ce55789a0ced)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.resx	(.../Resources.resx)	(revision 8404b9bd4e87e4a097a982ddccba6ecfa5aeec32)
@@ -142,7 +142,7 @@
   <data name="RelationshipsHS" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\RelationshipsHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Opening_new_project_cancelled" xml:space="preserve">
+  <data name="Project_new_opening_cancelled" xml:space="preserve">
     <value>Openen van nieuw Ringtoets project geannuleerd.</value>
   </data>
   <data name="information_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -304,7 +304,7 @@
   <data name="saveHS" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\saveHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Opening_existing_project_cancelled" xml:space="preserve">
+  <data name="Project_existing_project_opening_cancelled" xml:space="preserve">
     <value>Openen van bestaand Ringtoets project geannuleerd.</value>
   </data>
   <data name="graphhs" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -409,8 +409,8 @@
   <data name="Ribbon_Messages" xml:space="preserve">
     <value>Berichten</value>
   </data>
-  <data name="New_project_successfully_opened" xml:space="preserve">
-    <value>Nieuw project succesvol geopend.</value>
+  <data name="Project_new_successfully_opened" xml:space="preserve">
+    <value>Nieuw Ringtoets project 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>
@@ -544,7 +544,7 @@
   <data name="RingtoetsGui_InitializeMenusAndToolbars_Setting_up_menus_and_toolbars" xml:space="preserve">
     <value>Menu's en werkbalken instellen...</value>
   </data>
-  <data name="Opening_new_project" xml:space="preserve">
+  <data name="Project_new_opening" xml:space="preserve">
     <value>Openen van nieuw Ringtoets project.</value>
   </data>
   <data name="chart_bar" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -625,7 +625,7 @@
   <data name="Ribbon_Properties" xml:space="preserve">
     <value>Eigenschappen</value>
   </data>
-  <data name="Opening_existing_project" xml:space="preserve">
+  <data name="Project_existing_opening_project" xml:space="preserve">
     <value>Openen van bestaand Ringtoets project.</value>
   </data>
   <data name="brick" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -637,9 +637,6 @@
   <data name="folder_output" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\folder_output.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="GuiCommandHandler_CloseProject_Project_closed" xml:space="preserve">
-    <value>Project is gesloten.</value>
-  </data>
   <data name="Ribbon_Recent" xml:space="preserve">
     <value>Recent</value>
   </data>
@@ -745,9 +742,6 @@
   <data name="SplashScreen_Version" xml:space="preserve">
     <value>Versie</value>
   </data>
-  <data name="GuiCommandHandler_TryCloseProject_Closing_current_project" xml:space="preserve">
-    <value>Sluiten van huidig project.</value>
-  </data>
   <data name="RingtoetsGui_UpdateTitle_Unknown" xml:space="preserve">
     <value>Onbekend</value>
   </data>
@@ -949,7 +943,10 @@
   <data name="DynamicVisibleValidationMethod_only_one_allowed_per_Class_0_" xml:space="preserve">
     <value>Slechts één DynamicVisibleValidationMethod toegestaan per klasse: {0}.</value>
   </data>
-  <data name="Opening_existing_project_failed" xml:space="preserve">
+  <data name="Project_existing_project_opening_failed" xml:space="preserve">
     <value>Het is niet gelukt om het Ringtoets project te laden.</value>
   </data>
+  <data name="Project_existing_successfully_opened" xml:space="preserve">
+    <value>Bestaand Ringtoets project succesvol geopend.</value>
+  </data>
 </root>
\ No newline at end of file
Index: Core/Common/test/Core.Common.Integration.Test/Ringtoets/Application.Ringtoets/RingtoetsGuiIntegrationTest.cs
===================================================================
diff -u -rb824d24e9f2698cfd0ba7f253ffd037266c16dc4 -r8404b9bd4e87e4a097a982ddccba6ecfa5aeec32
--- Core/Common/test/Core.Common.Integration.Test/Ringtoets/Application.Ringtoets/RingtoetsGuiIntegrationTest.cs	(.../RingtoetsGuiIntegrationTest.cs)	(revision b824d24e9f2698cfd0ba7f253ffd037266c16dc4)
+++ Core/Common/test/Core.Common.Integration.Test/Ringtoets/Application.Ringtoets/RingtoetsGuiIntegrationTest.cs	(.../RingtoetsGuiIntegrationTest.cs)	(revision 8404b9bd4e87e4a097a982ddccba6ecfa5aeec32)
@@ -26,7 +26,7 @@
             {
                 gui.MainWindow = new MainWindow(gui);
                 gui.Run();
-                gui.CommandHandler.TryCloseProject(); //should not trigger exception
+                gui.CommandHandler.CloseProject(); //should not trigger exception
             }
         }