diff --git a/src/MusicStore/Startup.cs b/src/MusicStore/Startup.cs
index 62e2f6dc7b..3a5fe4af5f 100644
--- a/src/MusicStore/Startup.cs
+++ b/src/MusicStore/Startup.cs
@@ -22,7 +22,7 @@ namespace MusicStore
 
         public Startup(IApplicationEnvironment env, IRuntimeEnvironment runtimeEnvironment)
         {
-            //Below code demonstrates usage of multiple configuration sources. For instance a setting say 'setting1' is found in both the registered sources, 
+            //Below code demonstrates usage of multiple configuration sources. For instance a setting say 'setting1' is found in both the registered sources,
             //then the later source will win. By this way a Local config can be overridden by a different setting while deployed remotely.
             var builder = new ConfigurationBuilder(env.ApplicationBasePath)
                         .AddJsonFile("config.json")
@@ -128,7 +128,7 @@ namespace MusicStore
 
             // Display custom error page in production when error occurs
             // During development use the ErrorPage middleware to display error information in the browser
-            app.UseErrorPage();
+            app.UseDeveloperExceptionPage();
 
             app.UseDatabaseErrorPage(DatabaseErrorPageOptions.ShowAll);
 
@@ -149,7 +149,7 @@ namespace MusicStore
             // StatusCode pages to gracefully handle status codes 400-599.
             app.UseStatusCodePagesWithRedirects("~/Home/StatusCodePage");
 
-            app.UseErrorHandler("/Home/Error");
+            app.UseExceptionHandler("/Home/Error");
 
             Configure(app);
         }
@@ -163,7 +163,7 @@ namespace MusicStore
             // StatusCode pages to gracefully handle status codes 400-599.
             app.UseStatusCodePagesWithRedirects("~/Home/StatusCodePage");
 
-            app.UseErrorHandler("/Home/Error");
+            app.UseExceptionHandler("/Home/Error");
 
             Configure(app);
         }
diff --git a/src/MusicStore/StartupNtlmAuthentication.cs b/src/MusicStore/StartupNtlmAuthentication.cs
index 15544560aa..b2820de57a 100644
--- a/src/MusicStore/StartupNtlmAuthentication.cs
+++ b/src/MusicStore/StartupNtlmAuthentication.cs
@@ -90,7 +90,7 @@ namespace MusicStore
 
             // Error page middleware displays a nice formatted HTML page for any unhandled exceptions in the request pipeline.
             // Note: Not recommended for production.
-            app.UseErrorPage();
+            app.UseDeveloperExceptionPage();
 
             // Set up NTLM authentication for WebListener like below.
             // For IIS and IISExpress: Use inetmgr to setup NTLM authentication on the application vDir or modify the applicationHost.config to enable NTLM.
diff --git a/src/MusicStore/StartupOpenIdConnect.cs b/src/MusicStore/StartupOpenIdConnect.cs
index 9de5aa8666..cc6e27082c 100644
--- a/src/MusicStore/StartupOpenIdConnect.cs
+++ b/src/MusicStore/StartupOpenIdConnect.cs
@@ -115,7 +115,7 @@ namespace MusicStore
 
             // Display custom error page in production when error occurs
             // During development use the ErrorPage middleware to display error information in the browser
-            app.UseErrorPage();
+            app.UseDeveloperExceptionPage();
 
             app.UseDatabaseErrorPage(DatabaseErrorPageOptions.ShowAll);
 
diff --git a/test/E2ETests/compiler/shared/Mocks/StartupOpenIdConnectTesting.cs b/test/E2ETests/compiler/shared/Mocks/StartupOpenIdConnectTesting.cs
index d74e427797..999f37640a 100644
--- a/test/E2ETests/compiler/shared/Mocks/StartupOpenIdConnectTesting.cs
+++ b/test/E2ETests/compiler/shared/Mocks/StartupOpenIdConnectTesting.cs
@@ -123,7 +123,7 @@ namespace MusicStore
 
             // Display custom error page in production when error occurs
             // During development use the ErrorPage middleware to display error information in the browser
-            app.UseErrorPage();
+            app.UseDeveloperExceptionPage();
 
             app.UseDatabaseErrorPage(DatabaseErrorPageOptions.ShowAll);
 
diff --git a/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs b/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs
index 0bbf8c4cb4..39c50c6204 100644
--- a/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs
+++ b/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs
@@ -174,7 +174,7 @@ namespace MusicStore
 
             // Error page middleware displays a nice formatted HTML page for any unhandled exceptions in the request pipeline.
             // Note: Not recommended for production.
-            app.UseErrorPage();
+            app.UseDeveloperExceptionPage();
 
             app.UseDatabaseErrorPage(DatabaseErrorPageOptions.ShowAll);