diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
index c7388393efd..7d8ad8f49a8 100644
--- a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
@@ -856,6 +856,7 @@ private void CrashGracefully(Exception ex, bool fatal = false)
 
                         if (DynamoModel.IsTestMode)
                         {
+                            // Rethrow the exception during testing.
                             throw ex;
                         }
                         return;
@@ -866,13 +867,15 @@ private void CrashGracefully(Exception ex, bool fatal = false)
                 var crashData = new CrashErrorReportArgs(ex);
                 DynamoConsoleLogger.OnLogErrorToDynamoConsole($"Unhandled exception: {crashData.Details} ");
                 Analytics.TrackException(ex, true);
-                Model?.OnRequestsCrashPrompt(crashData);
 
                 if (DynamoModel.IsTestMode)
                 {
+                    // Rethrow the exception during testing.
                     throw ex;
                 }
 
+                Model?.OnRequestsCrashPrompt(crashData);
+
                 if (fatal)
                 {
                     // Fatal exception. Close Dynamo but do not terminate the process.
diff --git a/src/DynamoCoreWpf/Views/SplashScreen/SplashScreen.xaml.cs b/src/DynamoCoreWpf/Views/SplashScreen/SplashScreen.xaml.cs
index ce7984e2f13..8691f9789ae 100644
--- a/src/DynamoCoreWpf/Views/SplashScreen/SplashScreen.xaml.cs
+++ b/src/DynamoCoreWpf/Views/SplashScreen/SplashScreen.xaml.cs
@@ -205,6 +205,12 @@ private void WebView_NavigationCompleted(object sender, CoreWebView2NavigationCo
             }
             catch (Exception ex)
             {
+                if (DynamoModel.IsTestMode)
+                {
+                    // Rethrow exception during testing.
+                    throw;
+                }
+
                 if (!DynamoModel.IsCrashing && !IsClosing)
                 {
                     CrashReportTool.ShowCrashWindow(viewModel, new CrashErrorReportArgs(ex));