Index: Application/Riskeer/src/Application.Riskeer/App.xaml.cs
===================================================================
diff -u -rf1542ea58cee65e7bb0d7a398cd9359ecd3960bc -re426893bd2c1d93c5d054e505957ab6d20f02b2f
--- Application/Riskeer/src/Application.Riskeer/App.xaml.cs	(.../App.xaml.cs)	(revision f1542ea58cee65e7bb0d7a398cd9359ecd3960bc)
+++ Application/Riskeer/src/Application.Riskeer/App.xaml.cs	(.../App.xaml.cs)	(revision e426893bd2c1d93c5d054e505957ab6d20f02b2f)
@@ -47,7 +47,6 @@
 using Riskeer.GrassCoverErosionInwards.Plugin;
 using Riskeer.GrassCoverErosionOutwards.Plugin;
 using Riskeer.HeightStructures.Plugin;
-using Riskeer.Integration.Data;
 using Riskeer.Integration.Forms;
 using Riskeer.Integration.Plugin;
 using Riskeer.Integration.Plugin.Handlers;
@@ -131,7 +130,7 @@
                 SupportEmailAddressUrl = "https://www.helpdeskwater.nl/onderwerpen/applicaties-modellen/applicaties-per/omgevings/omgevings/riskeer/contact/vraag-ringtoets/",
                 SupportPhoneNumberUrl = "https://www.helpdeskwater.nl/secundaire-navigatie/contact/",
                 ManualFilePath = "Gebruikershandleiding Riskeer 21.1.1.pdf",
-                OnNewProjectCreatedAction = (g, project) => new AssessmentSectionFromFileHandler(g.ActiveParentWindow, g.DocumentViewController).GetAssessmentSectionFromFile()
+                OnNewProjectCreatedFunc = g => new AssessmentSectionFromFileHandler(g.ActiveParentWindow, g.DocumentViewController).GetAssessmentSectionFromFile()
             };
             
             var mainWindow = new MainWindow();
Index: Core/Gui/src/Core.Gui/GuiCore.cs
===================================================================
diff -u -r51d20987e8f059d028e56218184a66d4b2245a25 -re426893bd2c1d93c5d054e505957ab6d20f02b2f
--- Core/Gui/src/Core.Gui/GuiCore.cs	(.../GuiCore.cs)	(revision 51d20987e8f059d028e56218184a66d4b2245a25)
+++ Core/Gui/src/Core.Gui/GuiCore.cs	(.../GuiCore.cs)	(revision e426893bd2c1d93c5d054e505957ab6d20f02b2f)
@@ -72,7 +72,6 @@
         private bool isExiting;
 
         private StartScreen startScreen;
-        private bool creatingNewProject;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="GuiCore"/> class.
@@ -350,8 +349,7 @@
 
         private void OnNewProject()
         {
-            creatingNewProject = true;
-            StorageCommands.CreateNewProject();
+            StorageCommands.CreateNewProject(() => FixedSettings.OnNewProjectCreatedFunc(this));
         }
 
         private void OnOpenProject()
@@ -396,11 +394,6 @@
 
         private void ApplicationProjectOpened(IProject newProject)
         {
-            if (creatingNewProject)
-            {
-                FixedSettings.OnNewProjectCreatedAction(this, project);
-            }
-            
             mainWindow.ValidateItems();
 
             projectObserver.Observable = newProject;
@@ -411,8 +404,6 @@
             {
                 ShowMainWindow();
             }
-
-            creatingNewProject = false;
         }
 
         private void ApplicationBeforeProjectOpened(IProject oldProject)
Index: Core/Gui/src/Core.Gui/OpenProjectActivity.cs
===================================================================
diff -u -r434415295de74c310ce6d3cdd0100c28838cf9ea -re426893bd2c1d93c5d054e505957ab6d20f02b2f
--- Core/Gui/src/Core.Gui/OpenProjectActivity.cs	(.../OpenProjectActivity.cs)	(revision 434415295de74c310ce6d3cdd0100c28838cf9ea)
+++ Core/Gui/src/Core.Gui/OpenProjectActivity.cs	(.../OpenProjectActivity.cs)	(revision e426893bd2c1d93c5d054e505957ab6d20f02b2f)
@@ -38,7 +38,6 @@
     {
         private readonly string filePath;
         private readonly IProjectOwner projectOwner;
-        private readonly IProjectFactory projectFactory;
         private readonly IStoreProject storage;
         private readonly ILog log = LogManager.GetLogger(typeof(OpenProjectActivity));
         private readonly string migratedProjectFilePath;
@@ -77,7 +76,6 @@
 
             filePath = requiredOpenProjectProperties.FilePath;
             projectOwner = requiredOpenProjectProperties.ProjectOwner;
-            projectFactory = requiredOpenProjectProperties.ProjectFactory;
             storage = requiredOpenProjectProperties.ProjectStorage;
 
             Description = Resources.OpenProjectActivity_Open_project;
@@ -107,11 +105,8 @@
             switch (State)
             {
                 case ActivityState.Executed:
-                    InitializeSuccssfulOpenedProject();
+                    InitializeSuccessfulOpenedProject();
                     break;
-                case ActivityState.Failed:
-                    InitializeEmptyProject();
-                    break;
                 case ActivityState.Canceled:
                     ClearOpenedProject();
                     break;
@@ -202,17 +197,8 @@
             openedProject = null;
         }
 
-        private void InitializeEmptyProject()
+        private void InitializeSuccessfulOpenedProject()
         {
-            UpdateProgressText(Resources.OpenProjectActivity_ProgressTextStepName_InitializeEmptyProject,
-                               totalNumberOfSteps,
-                               totalNumberOfSteps);
-
-            projectOwner.SetProject(projectFactory.CreateNewProject(), null);
-        }
-
-        private void InitializeSuccssfulOpenedProject()
-        {
             UpdateProgressText(Resources.OpenProjectActivity_ProgressTextStepName_InitializeProject,
                                totalNumberOfSteps,
                                totalNumberOfSteps);
Index: Core/Gui/src/Core.Gui/Settings/GuiCoreSettings.cs
===================================================================
diff -u -rb41da4f0fb44af1cd286c3d77668280497ec8199 -re426893bd2c1d93c5d054e505957ab6d20f02b2f
--- Core/Gui/src/Core.Gui/Settings/GuiCoreSettings.cs	(.../GuiCoreSettings.cs)	(revision b41da4f0fb44af1cd286c3d77668280497ec8199)
+++ Core/Gui/src/Core.Gui/Settings/GuiCoreSettings.cs	(.../GuiCoreSettings.cs)	(revision e426893bd2c1d93c5d054e505957ab6d20f02b2f)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System;
-using Core.Common.Base.Data;
 
 namespace Core.Gui.Settings
 {
@@ -64,6 +63,6 @@
         /// </summary>
         public string ManualFilePath { get; set; }
 
-        public Action<IGui, IProject> OnNewProjectCreatedAction { get; set; }
+        public Func<IGui, object> OnNewProjectCreatedFunc { get; set; }
     }
 }
\ No newline at end of file
Index: Core/Gui/test/Core.Gui.Test/Forms/MainWindow/MainWindowTest.cs
===================================================================
diff -u -r4cd36cfdb9ddea498762088f113df2277ca62333 -re426893bd2c1d93c5d054e505957ab6d20f02b2f
--- Core/Gui/test/Core.Gui.Test/Forms/MainWindow/MainWindowTest.cs	(.../MainWindowTest.cs)	(revision 4cd36cfdb9ddea498762088f113df2277ca62333)
+++ Core/Gui/test/Core.Gui.Test/Forms/MainWindow/MainWindowTest.cs	(.../MainWindowTest.cs)	(revision e426893bd2c1d93c5d054e505957ab6d20f02b2f)
@@ -547,7 +547,9 @@
             var projectStore = mocks.Stub<IStoreProject>();
             var projectMigrator = mocks.Stub<IMigrateProject>();
             var projectFactory = mocks.Stub<IProjectFactory>();
-            projectFactory.Stub(pf => pf.CreateNewProject()).Return(project);
+            projectFactory.Stub(pf => pf.CreateNewProject(null))
+                          .IgnoreArguments()
+                          .Return(project);
             mocks.ReplayAll();
 
             using (var mainWindow = new Gui.Forms.MainWindow.MainWindow())
@@ -578,7 +580,9 @@
             var projectStore = mocks.Stub<IStoreProject>();
             var projectMigrator = mocks.Stub<IMigrateProject>();
             var projectFactory = mocks.Stub<IProjectFactory>();
-            projectFactory.Stub(pf => pf.CreateNewProject()).Return(project);
+            projectFactory.Stub(pf => pf.CreateNewProject(null))
+                          .IgnoreArguments()
+                          .Return(project);
             mocks.ReplayAll();
 
             using (var mainWindow = new Gui.Forms.MainWindow.MainWindow())
@@ -613,7 +617,9 @@
             var projectStore = mocks.Stub<IStoreProject>();
             var projectMigrator = mocks.Stub<IMigrateProject>();
             var projectFactory = mocks.Stub<IProjectFactory>();
-            projectFactory.Stub(pf => pf.CreateNewProject()).Return(project);
+            projectFactory.Stub(pf => pf.CreateNewProject(null))
+                          .IgnoreArguments()
+                          .Return(project);
             mocks.ReplayAll();
 
             using (var mainWindow = new Gui.Forms.MainWindow.MainWindow())
@@ -650,7 +656,9 @@
             var projectStore = mocks.Stub<IStoreProject>();
             var projectMigrator = mocks.Stub<IMigrateProject>();
             var projectFactory = mocks.Stub<IProjectFactory>();
-            projectFactory.Stub(pf => pf.CreateNewProject()).Return(project1);
+            projectFactory.Stub(pf => pf.CreateNewProject(null))
+                          .IgnoreArguments()
+                          .Return(project1);
             mocks.ReplayAll();
 
             using (var mainWindow = new Gui.Forms.MainWindow.MainWindow())
@@ -689,7 +697,9 @@
             var projectStore = mocks.Stub<IStoreProject>();
             var projectMigrator = mocks.Stub<IMigrateProject>();
             var projectFactory = mocks.Stub<IProjectFactory>();
-            projectFactory.Stub(pf => pf.CreateNewProject()).Return(project1);
+            projectFactory.Stub(pf => pf.CreateNewProject(null))
+                          .IgnoreArguments()
+                          .Return(project1);
             mocks.ReplayAll();
 
             using (var mainWindow = new Gui.Forms.MainWindow.MainWindow())
@@ -732,7 +742,9 @@
             var projectStore = mocks.Stub<IStoreProject>();
             var projectMigrator = mocks.Stub<IMigrateProject>();
             var projectFactory = mocks.Stub<IProjectFactory>();
-            projectFactory.Stub(pf => pf.CreateNewProject()).Return(project1);
+            projectFactory.Stub(pf => pf.CreateNewProject(null))
+                          .IgnoreArguments()
+                          .Return(project1);
             mocks.ReplayAll();
 
             using (var mainWindow = new Gui.Forms.MainWindow.MainWindow())
@@ -774,7 +786,9 @@
             var projectStore = mocks.Stub<IStoreProject>();
             var projectMigrator = mocks.Stub<IMigrateProject>();
             var projectFactory = mocks.Stub<IProjectFactory>();
-            projectFactory.Stub(pf => pf.CreateNewProject()).Return(mocks.Stub<IProject>());
+            projectFactory.Stub(pf => pf.CreateNewProject(null))
+                          .IgnoreArguments()
+                          .Return(mocks.Stub<IProject>());
             mocks.ReplayAll();
 
             using (var mainWindow = new Gui.Forms.MainWindow.MainWindow())
@@ -810,7 +824,9 @@
             var projectStore = mocks.Stub<IStoreProject>();
             var projectMigrator = mocks.Stub<IMigrateProject>();
             var projectFactory = mocks.Stub<IProjectFactory>();
-            projectFactory.Stub(pf => pf.CreateNewProject()).Return(mocks.Stub<IProject>());
+            projectFactory.Stub(pf => pf.CreateNewProject(null))
+                          .IgnoreArguments()
+                          .Return(mocks.Stub<IProject>());
             mocks.ReplayAll();
 
             using (var mainWindow = new Gui.Forms.MainWindow.MainWindow())
@@ -846,7 +862,9 @@
             var projectStore = mocks.Stub<IStoreProject>();
             var projectMigrator = mocks.Stub<IMigrateProject>();
             var projectFactory = mocks.Stub<IProjectFactory>();
-            projectFactory.Stub(pf => pf.CreateNewProject()).Return(mocks.Stub<IProject>());
+            projectFactory.Stub(pf => pf.CreateNewProject(null))
+                          .IgnoreArguments()
+                          .Return(mocks.Stub<IProject>());
             mocks.ReplayAll();
 
             using (var mainWindow = new Gui.Forms.MainWindow.MainWindow())
@@ -886,7 +904,9 @@
             var projectStore = mocks.Stub<IStoreProject>();
             var projectMigrator = mocks.Stub<IMigrateProject>();
             var projectFactory = mocks.Stub<IProjectFactory>();
-            projectFactory.Stub(pf => pf.CreateNewProject()).Return(mocks.Stub<IProject>());
+            projectFactory.Stub(pf => pf.CreateNewProject(null))
+                          .IgnoreArguments()
+                          .Return(mocks.Stub<IProject>());
             mocks.ReplayAll();
 
             using (var mainWindow = new Gui.Forms.MainWindow.MainWindow())
@@ -924,7 +944,9 @@
             var projectStore = mocks.Stub<IStoreProject>();
             var projectMigrator = mocks.Stub<IMigrateProject>();
             var projectFactory = mocks.Stub<IProjectFactory>();
-            projectFactory.Stub(pf => pf.CreateNewProject()).Return(mocks.Stub<IProject>());
+            projectFactory.Stub(pf => pf.CreateNewProject(null))
+                          .IgnoreArguments()
+                          .Return(mocks.Stub<IProject>());
             mocks.ReplayAll();
 
             using (var mainWindow = new Gui.Forms.MainWindow.MainWindow())
@@ -964,7 +986,9 @@
             var projectStore = mocks.Stub<IStoreProject>();
             var projectMigrator = mocks.Stub<IMigrateProject>();
             var projectFactory = mocks.Stub<IProjectFactory>();
-            projectFactory.Stub(pf => pf.CreateNewProject()).Return(mocks.Stub<IProject>());
+            projectFactory.Stub(pf => pf.CreateNewProject(null))
+                          .IgnoreArguments()
+                          .Return(mocks.Stub<IProject>());
             mocks.ReplayAll();
 
             using (var mainWindow = new Gui.Forms.MainWindow.MainWindow())
@@ -1000,7 +1024,9 @@
             var projectStore = mocks.Stub<IStoreProject>();
             var projectMigrator = mocks.Stub<IMigrateProject>();
             var projectFactory = mocks.Stub<IProjectFactory>();
-            projectFactory.Stub(pf => pf.CreateNewProject()).Return(mocks.Stub<IProject>());
+            projectFactory.Stub(pf => pf.CreateNewProject(null))
+                          .IgnoreArguments()
+                          .Return(mocks.Stub<IProject>());
             mocks.ReplayAll();
 
             using (var mainWindow = new Gui.Forms.MainWindow.MainWindow())
@@ -1040,7 +1066,9 @@
             var projectStore = mocks.Stub<IStoreProject>();
             var projectMigrator = mocks.Stub<IMigrateProject>();
             var projectFactory = mocks.Stub<IProjectFactory>();
-            projectFactory.Stub(pf => pf.CreateNewProject()).Return(mocks.Stub<IProject>());
+            projectFactory.Stub(pf => pf.CreateNewProject(null))
+                          .IgnoreArguments()
+                          .Return(mocks.Stub<IProject>());
             mocks.ReplayAll();
 
             using (var mainWindow = new Gui.Forms.MainWindow.MainWindow())
@@ -1078,7 +1106,9 @@
             var projectStore = mocks.Stub<IStoreProject>();
             var projectMigrator = mocks.Stub<IMigrateProject>();
             var projectFactory = mocks.Stub<IProjectFactory>();
-            projectFactory.Stub(pf => pf.CreateNewProject()).Return(mocks.Stub<IProject>());
+            projectFactory.Stub(pf => pf.CreateNewProject(null))
+                          .IgnoreArguments()
+                          .Return(mocks.Stub<IProject>());
             mocks.ReplayAll();
 
             using (var mainWindow = new Gui.Forms.MainWindow.MainWindow())
@@ -1175,7 +1205,8 @@
 
                 var projectMigrator = mocks.Stub<IMigrateProject>();
                 var projectFactory = mocks.Stub<IProjectFactory>();
-                projectFactory.Stub(pf => pf.CreateNewProject())
+                projectFactory.Stub(pf => pf.CreateNewProject(null))
+                              .IgnoreArguments()
                               .Return(project);
                 mocks.ReplayAll();
 
@@ -1238,7 +1269,8 @@
 
                 var projectMigrator = mocks.Stub<IMigrateProject>();
                 var projectFactory = mocks.Stub<IProjectFactory>();
-                projectFactory.Stub(pf => pf.CreateNewProject())
+                projectFactory.Stub(pf => pf.CreateNewProject(null))
+                              .IgnoreArguments()
                               .Return(project);
                 mocks.ReplayAll();
 
@@ -1297,7 +1329,8 @@
 
             var projectMigrator = mocks.Stub<IMigrateProject>();
             var projectFactory = mocks.Stub<IProjectFactory>();
-            projectFactory.Stub(pf => pf.CreateNewProject())
+            projectFactory.Stub(pf => pf.CreateNewProject(null))
+                          .IgnoreArguments()
                           .Return(project);
             mocks.ReplayAll();
 
@@ -1345,7 +1378,8 @@
             var projectStore = mocks.Stub<IStoreProject>();
             var projectMigrator = mocks.Stub<IMigrateProject>();
             var projectFactory = mocks.Stub<IProjectFactory>();
-            projectFactory.Stub(pf => pf.CreateNewProject())
+            projectFactory.Stub(pf => pf.CreateNewProject(null))
+                          .IgnoreArguments()
                           .Return(project);
             mocks.ReplayAll();
 
@@ -1376,7 +1410,8 @@
             var projectStore = mocks.Stub<IStoreProject>();
             var projectMigrator = mocks.Stub<IMigrateProject>();
             var projectFactory = mocks.Stub<IProjectFactory>();
-            projectFactory.Stub(pf => pf.CreateNewProject())
+            projectFactory.Stub(pf => pf.CreateNewProject(null))
+                          .IgnoreArguments()
                           .Return(project);
             mocks.ReplayAll();
 
@@ -1411,7 +1446,8 @@
             var projectStore = mocks.Stub<IStoreProject>();
             var projectMigrator = mocks.Stub<IMigrateProject>();
             var projectFactory = mocks.Stub<IProjectFactory>();
-            projectFactory.Stub(pf => pf.CreateNewProject())
+            projectFactory.Stub(pf => pf.CreateNewProject(null))
+                          .IgnoreArguments()
                           .Return(project);
             mocks.ReplayAll();
 
@@ -1450,7 +1486,9 @@
             var projectStore = mocks.Stub<IStoreProject>();
             var projectMigrator = mocks.Stub<IMigrateProject>();
             var projectFactory = mocks.Stub<IProjectFactory>();
-            projectFactory.Stub(pf => pf.CreateNewProject()).Return(mocks.Stub<IProject>());
+            projectFactory.Stub(pf => pf.CreateNewProject(null))
+                          .IgnoreArguments()
+                          .Return(mocks.Stub<IProject>());
             mocks.ReplayAll();
 
             using (var mainWindow = new Gui.Forms.MainWindow.MainWindow())
Index: Core/Gui/test/Core.Gui.Test/GuiCoreTest.cs
===================================================================
diff -u -r59a9a7de8b9239192db7ecf50bff988240c70b74 -re426893bd2c1d93c5d054e505957ab6d20f02b2f
--- Core/Gui/test/Core.Gui.Test/GuiCoreTest.cs	(.../GuiCoreTest.cs)	(revision 59a9a7de8b9239192db7ecf50bff988240c70b74)
+++ Core/Gui/test/Core.Gui.Test/GuiCoreTest.cs	(.../GuiCoreTest.cs)	(revision e426893bd2c1d93c5d054e505957ab6d20f02b2f)
@@ -613,7 +613,9 @@
             var project = mocks.Stub<IProject>();
             projectStore.Expect(ps => ps.LoadProject(testFile)).Return(project);
             var projectFactory = mocks.Stub<IProjectFactory>();
-            projectFactory.Stub(pf => pf.CreateNewProject()).Return(project);
+            projectFactory.Stub(pf => pf.CreateNewProject(null))
+                          .IgnoreArguments()
+                          .Return(project);
             mocks.ReplayAll();
 
             project.Name = fileName;
@@ -709,7 +711,9 @@
             var project = mocks.Stub<IProject>();
             project.Name = expectedProjectName;
             var projectFactory = mocks.Stub<IProjectFactory>();
-            projectFactory.Stub(ph => ph.CreateNewProject()).Return(project);
+            projectFactory.Stub(pf => pf.CreateNewProject(null))
+                          .IgnoreArguments()
+                          .Return(project);
 
             mocks.ReplayAll();
 
@@ -761,7 +765,9 @@
             var project = mocks.Stub<IProject>();
             project.Name = expectedProjectName;
             var projectFactory = mocks.Stub<IProjectFactory>();
-            projectFactory.Stub(ph => ph.CreateNewProject()).Return(project);
+            projectFactory.Stub(pf => pf.CreateNewProject(null))
+                          .IgnoreArguments()
+                          .Return(project);
 
             mocks.ReplayAll();
 
@@ -814,7 +820,9 @@
             var project = mocks.Stub<IProject>();
             project.Name = expectedProjectName;
             var projectFactory = mocks.Stub<IProjectFactory>();
-            projectFactory.Stub(ph => ph.CreateNewProject()).Return(project);
+            projectFactory.Stub(pf => pf.CreateNewProject(null))
+                          .IgnoreArguments()
+                          .Return(project);
 
             mocks.ReplayAll();
 
@@ -1601,7 +1609,9 @@
         private static IProjectFactory CreateProjectFactory(MockRepository mocks)
         {
             var projectFactory = mocks.Stub<IProjectFactory>();
-            projectFactory.Stub(pf => pf.CreateNewProject()).Return(mocks.Stub<IProject>());
+            projectFactory.Stub(pf => pf.CreateNewProject(null))
+                          .IgnoreArguments()
+                          .Return(mocks.Stub<IProject>());
 
             return projectFactory;
         }
Index: Core/Gui/test/Core.Gui.Test/OpenProjectActivityTest.cs
===================================================================
diff -u -r781a97409ffc49e5b666a7856f633f46178056df -re426893bd2c1d93c5d054e505957ab6d20f02b2f
--- Core/Gui/test/Core.Gui.Test/OpenProjectActivityTest.cs	(.../OpenProjectActivityTest.cs)	(revision 781a97409ffc49e5b666a7856f633f46178056df)
+++ Core/Gui/test/Core.Gui.Test/OpenProjectActivityTest.cs	(.../OpenProjectActivityTest.cs)	(revision e426893bd2c1d93c5d054e505957ab6d20f02b2f)
@@ -723,7 +723,8 @@
             var project = mocks.Stub<IProject>();
 
             var projectFactory = mocks.Stub<IProjectFactory>();
-            projectFactory.Expect(f => f.CreateNewProject())
+            projectFactory.Expect(pf => pf.CreateNewProject(null))
+                          .IgnoreArguments()
                           .Return(project);
             var projectOwner = mocks.Stub<IProjectOwner>();
             projectOwner.Expect(po => po.SetProject(project, null));
@@ -776,7 +777,8 @@
             var project = mocks.Stub<IProject>();
 
             var projectFactory = mocks.Stub<IProjectFactory>();
-            projectFactory.Expect(f => f.CreateNewProject())
+            projectFactory.Expect(pf => pf.CreateNewProject(null))
+                          .IgnoreArguments()
                           .Return(project);
             var projectOwner = mocks.Stub<IProjectOwner>();
             projectOwner.Expect(po => po.SetProject(project, null));