diff --git a/src/Middleware/Diagnostics/src/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs
index c58c53ce8b..d1d40b2e07 100644
--- a/src/Middleware/Diagnostics/src/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs
+++ b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs
@@ -4,12 +4,15 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Diagnostics.Internal;
 using Microsoft.AspNetCore.Diagnostics.RazorViews;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
@@ -192,6 +195,27 @@ namespace Microsoft.AspNetCore.Diagnostics
 
         private Task DisplayRuntimeException(HttpContext context, Exception ex)
         {
+            var endpoint = context.Features.Get<IEndpointFeature>()?.Endpoint;
+
+            EndpointModel endpointModel = null;
+            if (endpoint != null)
+            {
+                endpointModel = new EndpointModel();
+                endpointModel.DisplayName = endpoint.DisplayName;
+
+                if (endpoint is RouteEndpoint routeEndpoint)
+                {
+                    endpointModel.RoutePattern = routeEndpoint.RoutePattern.RawText;
+                    endpointModel.Order = routeEndpoint.Order;
+
+                    var httpMethods = endpoint.Metadata.GetMetadata<IHttpMethodMetadata>()?.HttpMethods;
+                    if (httpMethods != null)
+                    {
+                        endpointModel.HttpMethods = string.Join(", ", httpMethods);
+                    }
+                }
+            }
+                       
             var request = context.Request;
 
             var model = new ErrorPageModel
@@ -200,7 +224,9 @@ namespace Microsoft.AspNetCore.Diagnostics
                 ErrorDetails = _exceptionDetailsProvider.GetDetails(ex),
                 Query = request.Query,
                 Cookies = request.Cookies,
-                Headers = request.Headers
+                Headers = request.Headers,
+                RouteValues = request.RouteValues,
+                Endpoint = endpointModel
             };
 
             var errorPage = new ErrorPage(model);
diff --git a/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/CompilationErrorPage.Designer.cs b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/CompilationErrorPage.Designer.cs
index d5342bf79a..718cd466b5 100644
--- a/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/CompilationErrorPage.Designer.cs
+++ b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/CompilationErrorPage.Designer.cs
@@ -3,12 +3,12 @@
 namespace Microsoft.AspNetCore.Diagnostics.RazorViews
 {
     #line hidden
+    using System.Threading.Tasks;
 #line 1 "CompilationErrorPage.cshtml"
 using System;
 
 #line default
 #line hidden
-    using System.Threading.Tasks;
 #line 2 "CompilationErrorPage.cshtml"
 using System.Globalization;
 
@@ -62,11 +62,6 @@ using Microsoft.AspNetCore.Diagnostics.RazorViews;
     background-color: #fff;
 }
 
-h1, h2, h3, h4, h5 {
-    /*font-family: 'Segoe UI',Tahoma,Arial,Helvetica,sans-serif;*/
-    font-weight: 100;
-}
-
 h1 {
     color: #44525e;
     margin: 15px 0 15px 0;
@@ -79,10 +74,12 @@ h2 {
 h3 {
     color: #363636;
     margin: 5px 5px 0 0;
+    font-weight: normal;
 }
 
 code {
     font-family: Consolas, ""Courier New"", courier, monospace;
+    font-weight: bold;
 }
 
 body .titleerror {
@@ -112,10 +109,10 @@ body .location {
         cursor: pointer;
     }
 
-    #h");
-            WriteLiteral(@"eader .selected {
+    #header .selected {
         background: #44c5f2;
-        color: #fff;
+        color: #fff");
+            WriteLiteral(@";
     }
 
 #stackpage ul {
@@ -169,10 +166,15 @@ body .location {
         color: #606060;
     }
 
+#routingpage .subheader {
+    padding: 5px;
+    border-bottom: 1px #ddd solid;
+}
+
 .page table {
-    border-collapse: separate;
-    bo");
-            WriteLiteral(@"rder-spacing: 0;
+    border-collapse");
+            WriteLiteral(@": separate;
+    border-spacing: 0;
     margin: 0 0 20px;
 }
 
@@ -227,9 +229,9 @@ a {
 }
 
 .rawExceptionStackTrace {
-    font-size: 1.2em;
-");
-            WriteLiteral(@"}
+    ");
+            WriteLiteral(@"font-size: 1.2em;
+}
 
 .rawExceptionBlock {
     border-top: 1px #ddd solid;
@@ -259,21 +261,20 @@ a {
     </head>
     <body>
         <h1>");
-#line 222 "CompilationErrorPage.cshtml"
+#line 224 "CompilationErrorPage.cshtml"
        Write(Resources.ErrorPageHtml_CompilationException);
 
 #line default
 #line hidden
             WriteLiteral("</h1>\r\n");
-#line 223 "CompilationErrorPage.cshtml"
+#line 225 "CompilationErrorPage.cshtml"
           
             var exceptionDetailId = "";
         
 
 #line default
 #line hidden
-            WriteLiteral("        ");
-#line 226 "CompilationErrorPage.cshtml"
+#line 228 "CompilationErrorPage.cshtml"
          for (var i = 0; i < Model.ErrorDetails.Count; i++)
         {
             var errorDetail = Model.ErrorDetails[i];
@@ -283,7 +284,7 @@ a {
 #line default
 #line hidden
             WriteLiteral("            <div id=\"stackpage\" class=\"page\">\r\n");
-#line 232 "CompilationErrorPage.cshtml"
+#line 234 "CompilationErrorPage.cshtml"
                   
                     var stackFrameCount = 0;
                     var frameId = "";
@@ -294,39 +295,38 @@ a {
 #line default
 #line hidden
             WriteLiteral("                        <div class=\"titleerror\">");
-#line 238 "CompilationErrorPage.cshtml"
+#line 240 "CompilationErrorPage.cshtml"
                                            Write(fileName);
 
 #line default
 #line hidden
             WriteLiteral("</div>\r\n");
-#line 239 "CompilationErrorPage.cshtml"
+#line 241 "CompilationErrorPage.cshtml"
                     }
                 
 
 #line default
 #line hidden
-            WriteLiteral("                ");
-#line 241 "CompilationErrorPage.cshtml"
+#line 243 "CompilationErrorPage.cshtml"
                  if (!string.IsNullOrEmpty(errorDetail.ErrorMessage))
                 {
 
 #line default
 #line hidden
             WriteLiteral("                    <div class=\"details\">");
-#line 243 "CompilationErrorPage.cshtml"
+#line 245 "CompilationErrorPage.cshtml"
                                     Write(errorDetail.ErrorMessage);
 
 #line default
 #line hidden
             WriteLiteral("</div>\r\n");
-#line 244 "CompilationErrorPage.cshtml"
+#line 246 "CompilationErrorPage.cshtml"
                 }
 
 #line default
 #line hidden
             WriteLiteral("                <br />\r\n                <ul>\r\n");
-#line 247 "CompilationErrorPage.cshtml"
+#line 249 "CompilationErrorPage.cshtml"
                  foreach (var frame in errorDetail.StackFrames)
                 {
                     stackFrameCount++;
@@ -336,198 +336,198 @@ a {
 #line default
 #line hidden
             WriteLiteral("                    <li class=\"frame\"");
-            BeginWriteAttribute("id", " id=\"", 5268, "\"", 5281, 1);
-#line 252 "CompilationErrorPage.cshtml"
-WriteAttributeValue("", 5273, frameId, 5273, 8, false);
+            BeginWriteAttribute("id", " id=\"", 5287, "\"", 5300, 1);
+#line 254 "CompilationErrorPage.cshtml"
+WriteAttributeValue("", 5292, frameId, 5292, 8, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
             WriteLiteral(">\r\n");
-#line 253 "CompilationErrorPage.cshtml"
+#line 255 "CompilationErrorPage.cshtml"
                          if (!string.IsNullOrEmpty(frame.ErrorDetails))
                         {
 
 #line default
 #line hidden
             WriteLiteral("                            <h3>");
-#line 255 "CompilationErrorPage.cshtml"
+#line 257 "CompilationErrorPage.cshtml"
                            Write(frame.ErrorDetails);
 
 #line default
 #line hidden
             WriteLiteral("</h3>\r\n");
-#line 256 "CompilationErrorPage.cshtml"
+#line 258 "CompilationErrorPage.cshtml"
                         }
 
 #line default
 #line hidden
             WriteLiteral("\r\n");
-#line 258 "CompilationErrorPage.cshtml"
+#line 260 "CompilationErrorPage.cshtml"
                          if (frame.Line != 0 && frame.ContextCode.Any())
                         {
 
 #line default
 #line hidden
             WriteLiteral("                            <button class=\"expandCollapseButton\" data-frameId=\"");
-#line 260 "CompilationErrorPage.cshtml"
+#line 262 "CompilationErrorPage.cshtml"
                                                                           Write(frameId);
 
 #line default
 #line hidden
             WriteLiteral("\">+</button>\r\n                            <div class=\"source\">\r\n");
-#line 262 "CompilationErrorPage.cshtml"
+#line 264 "CompilationErrorPage.cshtml"
                                  if (frame.PreContextCode.Any())
                                 {
 
 #line default
 #line hidden
             WriteLiteral("                                    <ol");
-            BeginWriteAttribute("start", " start=\"", 5864, "\"", 5893, 1);
-#line 264 "CompilationErrorPage.cshtml"
-WriteAttributeValue("", 5872, frame.PreContextLine, 5872, 21, false);
+            BeginWriteAttribute("start", " start=\"", 5883, "\"", 5912, 1);
+#line 266 "CompilationErrorPage.cshtml"
+WriteAttributeValue("", 5891, frame.PreContextLine, 5891, 21, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
             WriteLiteral(" class=\"collapsible\">\r\n");
-#line 265 "CompilationErrorPage.cshtml"
+#line 267 "CompilationErrorPage.cshtml"
                                          foreach (var line in frame.PreContextCode)
                                         {
 
 #line default
 #line hidden
             WriteLiteral("                                            <li><span>");
-#line 267 "CompilationErrorPage.cshtml"
+#line 269 "CompilationErrorPage.cshtml"
                                                  Write(line);
 
 #line default
 #line hidden
             WriteLiteral("</span></li>\r\n");
-#line 268 "CompilationErrorPage.cshtml"
+#line 270 "CompilationErrorPage.cshtml"
                                         }
 
 #line default
 #line hidden
             WriteLiteral("                                    </ol>\r\n");
-#line 270 "CompilationErrorPage.cshtml"
+#line 272 "CompilationErrorPage.cshtml"
                                 }
 
 #line default
 #line hidden
             WriteLiteral("                                <ol");
-            BeginWriteAttribute("start", " start=\"", 6274, "\"", 6293, 1);
-#line 271 "CompilationErrorPage.cshtml"
-WriteAttributeValue("", 6282, frame.Line, 6282, 11, false);
+            BeginWriteAttribute("start", " start=\"", 6293, "\"", 6312, 1);
+#line 273 "CompilationErrorPage.cshtml"
+WriteAttributeValue("", 6301, frame.Line, 6301, 11, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
             WriteLiteral(" class=\"highlight\">\r\n");
-#line 272 "CompilationErrorPage.cshtml"
+#line 274 "CompilationErrorPage.cshtml"
                                      foreach (var line in frame.ContextCode)
                                     {
 
 #line default
 #line hidden
             WriteLiteral("                                        <li><span>");
-#line 274 "CompilationErrorPage.cshtml"
+#line 276 "CompilationErrorPage.cshtml"
                                              Write(line);
 
 #line default
 #line hidden
             WriteLiteral("</span></li>\r\n");
-#line 275 "CompilationErrorPage.cshtml"
+#line 277 "CompilationErrorPage.cshtml"
                                     }
 
 #line default
 #line hidden
             WriteLiteral("                                </ol>\r\n");
-#line 277 "CompilationErrorPage.cshtml"
+#line 279 "CompilationErrorPage.cshtml"
                                  if (frame.PostContextCode.Any())
                                 {
 
 #line default
 #line hidden
             WriteLiteral("                                    <ol");
-            BeginWriteAttribute("start", " start=\'", 6720, "\'", 6745, 1);
-#line 279 "CompilationErrorPage.cshtml"
-WriteAttributeValue("", 6728, frame.Line + 1, 6728, 17, false);
+            BeginWriteAttribute("start", " start=\'", 6739, "\'", 6764, 1);
+#line 281 "CompilationErrorPage.cshtml"
+WriteAttributeValue("", 6747, frame.Line + 1, 6747, 17, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
             WriteLiteral(" class=\"collapsible\">\r\n");
-#line 280 "CompilationErrorPage.cshtml"
+#line 282 "CompilationErrorPage.cshtml"
                                          foreach (var line in frame.PostContextCode)
                                         {
 
 #line default
 #line hidden
             WriteLiteral("                                            <li><span>");
-#line 282 "CompilationErrorPage.cshtml"
+#line 284 "CompilationErrorPage.cshtml"
                                                  Write(line);
 
 #line default
 #line hidden
             WriteLiteral("</span></li>\r\n");
-#line 283 "CompilationErrorPage.cshtml"
+#line 285 "CompilationErrorPage.cshtml"
                                         }
 
 #line default
 #line hidden
             WriteLiteral("                                    </ol>\r\n");
-#line 285 "CompilationErrorPage.cshtml"
+#line 287 "CompilationErrorPage.cshtml"
                                 }
 
 #line default
 #line hidden
             WriteLiteral("                            </div>\r\n");
-#line 287 "CompilationErrorPage.cshtml"
+#line 289 "CompilationErrorPage.cshtml"
                         }
 
 #line default
 #line hidden
             WriteLiteral("                    </li>\r\n");
-#line 289 "CompilationErrorPage.cshtml"
+#line 291 "CompilationErrorPage.cshtml"
                 }
 
 #line default
 #line hidden
             WriteLiteral("                </ul>\r\n                <br />\r\n            </div>\r\n");
-#line 293 "CompilationErrorPage.cshtml"
+#line 295 "CompilationErrorPage.cshtml"
              if (!string.IsNullOrEmpty(Model.CompiledContent[i]))
             {
 
 #line default
 #line hidden
             WriteLiteral("                <div class=\"rawExceptionBlock\">\r\n                    <div class=\"showRawExceptionContainer\">\r\n                        <button class=\"showRawException\" data-exceptionDetailId=\"");
-#line 297 "CompilationErrorPage.cshtml"
+#line 299 "CompilationErrorPage.cshtml"
                                                                             Write(exceptionDetailId);
 
 #line default
 #line hidden
             WriteLiteral("\">Show compilation source</button>\r\n                    </div>\r\n                    <div");
-            BeginWriteAttribute("id", " id=\"", 7647, "\"", 7670, 1);
-#line 299 "CompilationErrorPage.cshtml"
-WriteAttributeValue("", 7652, exceptionDetailId, 7652, 18, false);
+            BeginWriteAttribute("id", " id=\"", 7666, "\"", 7689, 1);
+#line 301 "CompilationErrorPage.cshtml"
+WriteAttributeValue("", 7671, exceptionDetailId, 7671, 18, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
             WriteLiteral(" class=\"rawExceptionDetails\">\r\n                        <pre class=\"rawExceptionStackTrace\">");
-#line 300 "CompilationErrorPage.cshtml"
+#line 302 "CompilationErrorPage.cshtml"
                                                        Write(Model.CompiledContent[i]);
 
 #line default
 #line hidden
             WriteLiteral("</pre>\r\n                    </div>\r\n                </div>\r\n");
-#line 303 "CompilationErrorPage.cshtml"
+#line 305 "CompilationErrorPage.cshtml"
             }
 
 #line default
 #line hidden
-#line 303 "CompilationErrorPage.cshtml"
+#line 305 "CompilationErrorPage.cshtml"
              
         }
 
diff --git a/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/EndpointModel.cs b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/EndpointModel.cs
new file mode 100644
index 0000000000..b4b88187c5
--- /dev/null
+++ b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/EndpointModel.cs
@@ -0,0 +1,13 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Diagnostics.RazorViews
+{
+    internal class EndpointModel
+    {
+        public string DisplayName { get; set; }
+        public string RoutePattern { get; set; }
+        public int? Order { get; set; }
+        public string HttpMethods { get; set; }
+    }
+}
diff --git a/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/ErrorPage.Designer.cs b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/ErrorPage.Designer.cs
index ea4969b0ed..93e6126a1a 100644
--- a/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/ErrorPage.Designer.cs
+++ b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/ErrorPage.Designer.cs
@@ -3,12 +3,12 @@
 namespace Microsoft.AspNetCore.Diagnostics.RazorViews
 {
     #line hidden
+    using System.Threading.Tasks;
 #line 1 "ErrorPage.cshtml"
 using System;
 
 #line default
 #line hidden
-    using System.Threading.Tasks;
 #line 2 "ErrorPage.cshtml"
 using System.Globalization;
 
@@ -75,11 +75,6 @@ WriteAttributeValue("", 543, CultureInfo.CurrentUICulture.TwoLetterISOLanguageNa
     background-color: #fff;
 }
 
-h1, h2, h3, h4, h5 {
-    /*font-family: 'Segoe UI',Tahoma,Arial,Helvetica,sans-serif;*/
-    font-weight: 100;
-}
-
 h1 {
     color: #44525e;
     margin: 15px 0 15px 0;
@@ -92,10 +87,12 @@ h2 {
 h3 {
     color: #363636;
     margin: 5px 5px 0 0;
+    font-weight: normal;
 }
 
 code {
     font-family: Consolas, ""Courier New"", courier, monospace;
+    font-weight: bold;
 }
 
 body .titleerror {
@@ -125,10 +122,10 @@ body .location {
         cursor: pointer;
     }
 
-    #h");
-            WriteLiteral(@"eader .selected {
+    #header .selected {
         background: #44c5f2;
-        color: #fff;
+        color: #fff");
+            WriteLiteral(@";
     }
 
 #stackpage ul {
@@ -182,10 +179,15 @@ body .location {
         color: #606060;
     }
 
+#routingpage .subheader {
+    padding: 5px;
+    border-bottom: 1px #ddd solid;
+}
+
 .page table {
-    border-collapse: separate;
-    bo");
-            WriteLiteral(@"rder-spacing: 0;
+    border-collapse");
+            WriteLiteral(@": separate;
+    border-spacing: 0;
     margin: 0 0 20px;
 }
 
@@ -240,9 +242,9 @@ a {
 }
 
 .rawExceptionStackTrace {
-    font-size: 1.2em;
-");
-            WriteLiteral(@"}
+    ");
+            WriteLiteral(@"font-size: 1.2em;
+}
 
 .rawExceptionBlock {
     border-top: 1px #ddd solid;
@@ -272,33 +274,33 @@ a {
     </head>
     <body>
         <h1>");
-#line 228 "ErrorPage.cshtml"
+#line 230 "ErrorPage.cshtml"
        Write(Resources.ErrorPageHtml_UnhandledException);
 
 #line default
 #line hidden
             WriteLiteral("</h1>\r\n");
-#line 229 "ErrorPage.cshtml"
+#line 231 "ErrorPage.cshtml"
          foreach (var errorDetail in Model.ErrorDetails)
         {
 
 #line default
 #line hidden
             WriteLiteral("            <div class=\"titleerror\">");
-#line 231 "ErrorPage.cshtml"
+#line 233 "ErrorPage.cshtml"
                                Write(errorDetail.Error.GetType().Name);
 
 #line default
 #line hidden
             WriteLiteral(": ");
-#line 231 "ErrorPage.cshtml"
+#line 233 "ErrorPage.cshtml"
                                                                           Output.Write(HtmlEncodeAndReplaceLineBreaks(errorDetail.Error.Message)); 
 
 #line default
 #line hidden
             WriteLiteral("</div>\r\n");
-#line 232 "ErrorPage.cshtml"
-            
+#line 234 "ErrorPage.cshtml"
+
             var firstFrame = errorDetail.StackFrames.FirstOrDefault();
             if (firstFrame != null)
             {
@@ -310,33 +312,33 @@ a {
 #line default
 #line hidden
             WriteLiteral("                <p class=\"location\">");
-#line 240 "ErrorPage.cshtml"
+#line 242 "ErrorPage.cshtml"
                                Write(location);
 
 #line default
 #line hidden
             WriteLiteral(" in <code");
-            BeginWriteAttribute("title", " title=\"", 4950, "\"", 4974, 1);
-#line 240 "ErrorPage.cshtml"
-WriteAttributeValue("", 4958, firstFrame.File, 4958, 16, false);
+            BeginWriteAttribute("title", " title=\"", 4957, "\"", 4981, 1);
+#line 242 "ErrorPage.cshtml"
+WriteAttributeValue("", 4965, firstFrame.File, 4965, 16, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
             WriteLiteral(">");
-#line 240 "ErrorPage.cshtml"
+#line 242 "ErrorPage.cshtml"
                                                                            Write(System.IO.Path.GetFileName(firstFrame.File));
 
 #line default
 #line hidden
             WriteLiteral("</code>, line ");
-#line 240 "ErrorPage.cshtml"
+#line 242 "ErrorPage.cshtml"
                                                                                                                                      Write(firstFrame.Line);
 
 #line default
 #line hidden
             WriteLiteral("</p>\r\n");
-#line 241 "ErrorPage.cshtml"
+#line 243 "ErrorPage.cshtml"
             }
             else if (!string.IsNullOrEmpty(location))
             {
@@ -344,13 +346,13 @@ WriteAttributeValue("", 4958, firstFrame.File, 4958, 16, false);
 #line default
 #line hidden
             WriteLiteral("                <p class=\"location\">");
-#line 244 "ErrorPage.cshtml"
+#line 246 "ErrorPage.cshtml"
                                Write(location);
 
 #line default
 #line hidden
             WriteLiteral("</p>\r\n");
-#line 245 "ErrorPage.cshtml"
+#line 247 "ErrorPage.cshtml"
             }
             else
             {
@@ -358,13 +360,13 @@ WriteAttributeValue("", 4958, firstFrame.File, 4958, 16, false);
 #line default
 #line hidden
             WriteLiteral("                <p class=\"location\">");
-#line 248 "ErrorPage.cshtml"
+#line 250 "ErrorPage.cshtml"
                                Write(Resources.ErrorPageHtml_UnknownLocation);
 
 #line default
 #line hidden
             WriteLiteral("</p>\r\n");
-#line 249 "ErrorPage.cshtml"
+#line 251 "ErrorPage.cshtml"
             }
 
             var reflectionTypeLoadException = errorDetail.Error as ReflectionTypeLoadException;
@@ -376,26 +378,26 @@ WriteAttributeValue("", 4958, firstFrame.File, 4958, 16, false);
 #line default
 #line hidden
             WriteLiteral("                    <h3>Loader Exceptions:</h3>\r\n                    <ul>\r\n");
-#line 258 "ErrorPage.cshtml"
+#line 260 "ErrorPage.cshtml"
                          foreach (var ex in reflectionTypeLoadException.LoaderExceptions)
                         {
 
 #line default
 #line hidden
             WriteLiteral("                            <li>");
-#line 260 "ErrorPage.cshtml"
+#line 262 "ErrorPage.cshtml"
                            Write(ex.Message);
 
 #line default
 #line hidden
             WriteLiteral("</li>\r\n");
-#line 261 "ErrorPage.cshtml"
+#line 263 "ErrorPage.cshtml"
                         }
 
 #line default
 #line hidden
             WriteLiteral("                    </ul>\r\n");
-#line 263 "ErrorPage.cshtml"
+#line 265 "ErrorPage.cshtml"
                 }
             }
         }
@@ -403,31 +405,37 @@ WriteAttributeValue("", 4958, firstFrame.File, 4958, 16, false);
 #line default
 #line hidden
             WriteLiteral("        <ul id=\"header\">\r\n            <li id=\"stack\" tabindex=\"1\" class=\"selected\">\r\n                ");
-#line 268 "ErrorPage.cshtml"
+#line 270 "ErrorPage.cshtml"
            Write(Resources.ErrorPageHtml_StackButton);
 
 #line default
 #line hidden
             WriteLiteral("\r\n            </li>\r\n            <li id=\"query\" tabindex=\"2\">\r\n                ");
-#line 271 "ErrorPage.cshtml"
+#line 273 "ErrorPage.cshtml"
            Write(Resources.ErrorPageHtml_QueryButton);
 
 #line default
 #line hidden
             WriteLiteral("\r\n            </li>\r\n            <li id=\"cookies\" tabindex=\"3\">\r\n                ");
-#line 274 "ErrorPage.cshtml"
+#line 276 "ErrorPage.cshtml"
            Write(Resources.ErrorPageHtml_CookiesButton);
 
 #line default
 #line hidden
             WriteLiteral("\r\n            </li>\r\n            <li id=\"headers\" tabindex=\"4\">\r\n                ");
-#line 277 "ErrorPage.cshtml"
+#line 279 "ErrorPage.cshtml"
            Write(Resources.ErrorPageHtml_HeadersButton);
 
+#line default
+#line hidden
+            WriteLiteral("\r\n            </li>\r\n            <li id=\"routing\" tabindex=\"5\">\r\n                ");
+#line 282 "ErrorPage.cshtml"
+           Write(Resources.ErrorPageHtml_RoutingButton);
+
 #line default
 #line hidden
             WriteLiteral("\r\n            </li>\r\n        </ul>\r\n\r\n        <div id=\"stackpage\" class=\"page\">\r\n            <ul>\r\n");
-#line 283 "ErrorPage.cshtml"
+#line 288 "ErrorPage.cshtml"
                   
                     var exceptionCount = 0;
                     var stackFrameCount = 0;
@@ -437,8 +445,7 @@ WriteAttributeValue("", 4958, firstFrame.File, 4958, 16, false);
 
 #line default
 #line hidden
-            WriteLiteral("                ");
-#line 289 "ErrorPage.cshtml"
+#line 294 "ErrorPage.cshtml"
                  foreach (var errorDetail in Model.ErrorDetails)
                 {
                     exceptionCount++;
@@ -448,267 +455,267 @@ WriteAttributeValue("", 4958, firstFrame.File, 4958, 16, false);
 #line default
 #line hidden
             WriteLiteral("                    <li>\r\n                        <h2 class=\"stackerror\">");
-#line 295 "ErrorPage.cshtml"
+#line 300 "ErrorPage.cshtml"
                                           Write(errorDetail.Error.GetType().Name);
 
 #line default
 #line hidden
             WriteLiteral(": ");
-#line 295 "ErrorPage.cshtml"
+#line 300 "ErrorPage.cshtml"
                                                                              Write(errorDetail.Error.Message);
 
 #line default
 #line hidden
             WriteLiteral("</h2>\r\n                        <ul>\r\n");
-#line 297 "ErrorPage.cshtml"
-                         foreach (var frame in errorDetail.StackFrames)
-                        {
-                            stackFrameCount++;
-                            frameId = "frame" + stackFrameCount;
+#line 302 "ErrorPage.cshtml"
+                             foreach (var frame in errorDetail.StackFrames)
+                            {
+                                stackFrameCount++;
+                                frameId = "frame" + stackFrameCount;
 
 
 #line default
 #line hidden
-            WriteLiteral("                            <li class=\"frame\"");
-            BeginWriteAttribute("id", " id=\"", 7386, "\"", 7399, 1);
-#line 302 "ErrorPage.cshtml"
-WriteAttributeValue("", 7391, frameId, 7391, 8, false);
+            WriteLiteral("                                <li class=\"frame\"");
+            BeginWriteAttribute("id", " id=\"", 7532, "\"", 7545, 1);
+#line 307 "ErrorPage.cshtml"
+WriteAttributeValue("", 7537, frameId, 7537, 8, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
             WriteLiteral(">\r\n");
-#line 303 "ErrorPage.cshtml"
-                                 if (string.IsNullOrEmpty(frame.File))
-                                {
+#line 308 "ErrorPage.cshtml"
+                                     if (string.IsNullOrEmpty(frame.File))
+                                    {
 
 #line default
 #line hidden
-            WriteLiteral("                                    <h3>");
-#line 305 "ErrorPage.cshtml"
-                                   Write(frame.Function);
+            WriteLiteral("                                        <h3>");
+#line 310 "ErrorPage.cshtml"
+                                       Write(frame.Function);
 
 #line default
 #line hidden
             WriteLiteral("</h3>\r\n");
-#line 306 "ErrorPage.cshtml"
-                                }
-                                else
-                                {
+#line 311 "ErrorPage.cshtml"
+                                    }
+                                    else
+                                    {
 
 #line default
 #line hidden
-            WriteLiteral("                                    <h3>");
-#line 309 "ErrorPage.cshtml"
-                                   Write(frame.Function);
+            WriteLiteral("                                        <h3>");
+#line 314 "ErrorPage.cshtml"
+                                       Write(frame.Function);
 
 #line default
 #line hidden
             WriteLiteral(" in <code");
-            BeginWriteAttribute("title", " title=\"", 7744, "\"", 7763, 1);
-#line 309 "ErrorPage.cshtml"
-WriteAttributeValue("", 7752, frame.File, 7752, 11, false);
+            BeginWriteAttribute("title", " title=\"", 7918, "\"", 7937, 1);
+#line 314 "ErrorPage.cshtml"
+WriteAttributeValue("", 7926, frame.File, 7926, 11, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
             WriteLiteral(">");
-#line 309 "ErrorPage.cshtml"
-                                                                                Write(System.IO.Path.GetFileName(frame.File));
+#line 314 "ErrorPage.cshtml"
+                                                                                    Write(System.IO.Path.GetFileName(frame.File));
 
 #line default
 #line hidden
             WriteLiteral("</code></h3>\r\n");
-#line 310 "ErrorPage.cshtml"
-                                }
+#line 315 "ErrorPage.cshtml"
+                                    }
 
 #line default
 #line hidden
             WriteLiteral("\r\n");
-#line 312 "ErrorPage.cshtml"
-                                 if (frame.Line != 0 && frame.ContextCode.Any())
-                                {
+#line 317 "ErrorPage.cshtml"
+                                     if (frame.Line != 0 && frame.ContextCode.Any())
+                                    {
 
 #line default
 #line hidden
-            WriteLiteral("                                    <button class=\"expandCollapseButton\" data-frameId=\"");
-#line 314 "ErrorPage.cshtml"
-                                                                                  Write(frameId);
+            WriteLiteral("                                        <button class=\"expandCollapseButton\" data-frameId=\"");
+#line 319 "ErrorPage.cshtml"
+                                                                                      Write(frameId);
 
 #line default
 #line hidden
-            WriteLiteral("\">+</button>\r\n                                    <div class=\"source\">\r\n");
-#line 316 "ErrorPage.cshtml"
-                                         if (frame.PreContextCode.Any())
-                                        {
+            WriteLiteral("\">+</button>\r\n                                        <div class=\"source\">\r\n");
+#line 321 "ErrorPage.cshtml"
+                                             if (frame.PreContextCode.Any())
+                                            {
 
 #line default
 #line hidden
-            WriteLiteral("                                            <ol");
-            BeginWriteAttribute("start", " start=\"", 8303, "\"", 8332, 1);
-#line 318 "ErrorPage.cshtml"
-WriteAttributeValue("", 8311, frame.PreContextLine, 8311, 21, false);
+            WriteLiteral("                                                <ol");
+            BeginWriteAttribute("start", " start=\"", 8509, "\"", 8538, 1);
+#line 323 "ErrorPage.cshtml"
+WriteAttributeValue("", 8517, frame.PreContextLine, 8517, 21, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
             WriteLiteral(" class=\"collapsible\">\r\n");
-#line 319 "ErrorPage.cshtml"
-                                                 foreach (var line in frame.PreContextCode)
-                                                {
+#line 324 "ErrorPage.cshtml"
+                                                     foreach (var line in frame.PreContextCode)
+                                                    {
 
 #line default
 #line hidden
-            WriteLiteral("                                                    <li><span>");
-#line 321 "ErrorPage.cshtml"
-                                                         Write(line);
+            WriteLiteral("                                                        <li><span>");
+#line 326 "ErrorPage.cshtml"
+                                                             Write(line);
 
 #line default
 #line hidden
             WriteLiteral("</span></li>\r\n");
-#line 322 "ErrorPage.cshtml"
-                                                }
+#line 327 "ErrorPage.cshtml"
+                                                    }
 
 #line default
 #line hidden
-            WriteLiteral("                                            </ol>\r\n");
-#line 324 "ErrorPage.cshtml"
-                                        }
+            WriteLiteral("                                                </ol>\r\n");
+#line 329 "ErrorPage.cshtml"
+                                            }
 
 #line default
 #line hidden
-            WriteLiteral("\r\n                                        <ol");
-            BeginWriteAttribute("start", " start=\"", 8771, "\"", 8790, 1);
-#line 326 "ErrorPage.cshtml"
-WriteAttributeValue("", 8779, frame.Line, 8779, 11, false);
+            WriteLiteral("\r\n                                            <ol");
+            BeginWriteAttribute("start", " start=\"", 9005, "\"", 9024, 1);
+#line 331 "ErrorPage.cshtml"
+WriteAttributeValue("", 9013, frame.Line, 9013, 11, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
             WriteLiteral(" class=\"highlight\">\r\n");
-#line 327 "ErrorPage.cshtml"
-                                             foreach (var line in frame.ContextCode)
-                                            {
-
-#line default
-#line hidden
-            WriteLiteral("                                                <li><span>");
-#line 329 "ErrorPage.cshtml"
-                                                     Write(line);
-
-#line default
-#line hidden
-            WriteLiteral("</span></li>\r\n");
-#line 330 "ErrorPage.cshtml"
-                                            }
-
-#line default
-#line hidden
-            WriteLiteral("                                        </ol>\r\n\r\n");
-#line 333 "ErrorPage.cshtml"
-                                         if (frame.PostContextCode.Any())
-                                        {
-
-#line default
-#line hidden
-            WriteLiteral("                                            <ol");
-            BeginWriteAttribute("start", " start=\'", 9283, "\'", 9308, 1);
-#line 335 "ErrorPage.cshtml"
-WriteAttributeValue("", 9291, frame.Line + 1, 9291, 17, false);
-
-#line default
-#line hidden
-            EndWriteAttribute();
-            WriteLiteral(" class=\"collapsible\">\r\n");
-#line 336 "ErrorPage.cshtml"
-                                                 foreach (var line in frame.PostContextCode)
+#line 332 "ErrorPage.cshtml"
+                                                 foreach (var line in frame.ContextCode)
                                                 {
 
 #line default
 #line hidden
             WriteLiteral("                                                    <li><span>");
-#line 338 "ErrorPage.cshtml"
+#line 334 "ErrorPage.cshtml"
                                                          Write(line);
 
 #line default
 #line hidden
             WriteLiteral("</span></li>\r\n");
-#line 339 "ErrorPage.cshtml"
+#line 335 "ErrorPage.cshtml"
                                                 }
 
 #line default
 #line hidden
-            WriteLiteral("                                            </ol>\r\n");
+            WriteLiteral("                                            </ol>\r\n\r\n");
+#line 338 "ErrorPage.cshtml"
+                                             if (frame.PostContextCode.Any())
+                                            {
+
+#line default
+#line hidden
+            WriteLiteral("                                                <ol");
+            BeginWriteAttribute("start", " start=\'", 9549, "\'", 9574, 1);
+#line 340 "ErrorPage.cshtml"
+WriteAttributeValue("", 9557, frame.Line + 1, 9557, 17, false);
+
+#line default
+#line hidden
+            EndWriteAttribute();
+            WriteLiteral(" class=\"collapsible\">\r\n");
 #line 341 "ErrorPage.cshtml"
-                                        }
+                                                     foreach (var line in frame.PostContextCode)
+                                                    {
 
 #line default
 #line hidden
-            WriteLiteral("                                    </div>\r\n");
+            WriteLiteral("                                                        <li><span>");
 #line 343 "ErrorPage.cshtml"
-                                }
+                                                             Write(line);
 
 #line default
 #line hidden
-            WriteLiteral("                            </li>\r\n");
-#line 345 "ErrorPage.cshtml"
-                        }
+            WriteLiteral("</span></li>\r\n");
+#line 344 "ErrorPage.cshtml"
+                                                    }
+
+#line default
+#line hidden
+            WriteLiteral("                                                </ol>\r\n");
+#line 346 "ErrorPage.cshtml"
+                                            }
+
+#line default
+#line hidden
+            WriteLiteral("                                        </div>\r\n");
+#line 348 "ErrorPage.cshtml"
+                                    }
+
+#line default
+#line hidden
+            WriteLiteral("                                </li>\r\n");
+#line 350 "ErrorPage.cshtml"
+                            }
 
 #line default
 #line hidden
             WriteLiteral(@"                        </ul>
                     </li>
                     <li>
-                        <br/>
+                        <br />
                         <div class=""rawExceptionBlock"">
                             <div class=""showRawExceptionContainer"">
                                 <button class=""showRawException"" data-exceptionDetailId=""");
-#line 352 "ErrorPage.cshtml"
+#line 357 "ErrorPage.cshtml"
                                                                                     Write(exceptionDetailId);
 
 #line default
 #line hidden
             WriteLiteral("\">Show raw exception details</button>\r\n                            </div>\r\n                            <div");
-            BeginWriteAttribute("id", " id=\"", 10299, "\"", 10322, 1);
-#line 354 "ErrorPage.cshtml"
-WriteAttributeValue("", 10304, exceptionDetailId, 10304, 18, false);
+            BeginWriteAttribute("id", " id=\"", 10606, "\"", 10629, 1);
+#line 359 "ErrorPage.cshtml"
+WriteAttributeValue("", 10611, exceptionDetailId, 10611, 18, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
             WriteLiteral(" class=\"rawExceptionDetails\">\r\n                                <pre class=\"rawExceptionStackTrace\">");
-#line 355 "ErrorPage.cshtml"
+#line 360 "ErrorPage.cshtml"
                                                                Write(errorDetail.Error.ToString());
 
 #line default
 #line hidden
             WriteLiteral("</pre>\r\n                            </div>\r\n                        </div>\r\n                    </li>\r\n");
-#line 359 "ErrorPage.cshtml"
+#line 364 "ErrorPage.cshtml"
                 }
 
 #line default
 #line hidden
             WriteLiteral("            </ul>\r\n        </div>\r\n\r\n        <div id=\"querypage\" class=\"page\">\r\n");
-#line 364 "ErrorPage.cshtml"
+#line 369 "ErrorPage.cshtml"
              if (Model.Query.Any())
             {
 
 #line default
 #line hidden
             WriteLiteral("                <table>\r\n                    <thead>\r\n                        <tr>\r\n                            <th>");
-#line 369 "ErrorPage.cshtml"
+#line 374 "ErrorPage.cshtml"
                            Write(Resources.ErrorPageHtml_VariableColumn);
 
 #line default
 #line hidden
             WriteLiteral("</th>\r\n                            <th>");
-#line 370 "ErrorPage.cshtml"
+#line 375 "ErrorPage.cshtml"
                            Write(Resources.ErrorPageHtml_ValueColumn);
 
 #line default
 #line hidden
             WriteLiteral("</th>\r\n                        </tr>\r\n                    </thead>\r\n                    <tbody>\r\n");
-#line 374 "ErrorPage.cshtml"
+#line 379 "ErrorPage.cshtml"
                          foreach (var kv in Model.Query.OrderBy(kv => kv.Key))
                         {
                             foreach (var v in kv.Value)
@@ -717,26 +724,26 @@ WriteAttributeValue("", 10304, exceptionDetailId, 10304, 18, false);
 #line default
 #line hidden
             WriteLiteral("                                <tr>\r\n                                    <td>");
-#line 379 "ErrorPage.cshtml"
+#line 384 "ErrorPage.cshtml"
                                    Write(kv.Key);
 
 #line default
 #line hidden
             WriteLiteral("</td>\r\n                                    <td>");
-#line 380 "ErrorPage.cshtml"
+#line 385 "ErrorPage.cshtml"
                                    Write(v);
 
 #line default
 #line hidden
             WriteLiteral("</td>\r\n                                </tr>\r\n");
-#line 382 "ErrorPage.cshtml"
+#line 387 "ErrorPage.cshtml"
                             }
                         }
 
 #line default
 #line hidden
             WriteLiteral("                    </tbody>\r\n                </table>\r\n");
-#line 386 "ErrorPage.cshtml"
+#line 391 "ErrorPage.cshtml"
             }
             else
             {
@@ -744,63 +751,63 @@ WriteAttributeValue("", 10304, exceptionDetailId, 10304, 18, false);
 #line default
 #line hidden
             WriteLiteral("                <p>");
-#line 389 "ErrorPage.cshtml"
+#line 394 "ErrorPage.cshtml"
               Write(Resources.ErrorPageHtml_NoQueryStringData);
 
 #line default
 #line hidden
             WriteLiteral("</p>\r\n");
-#line 390 "ErrorPage.cshtml"
+#line 395 "ErrorPage.cshtml"
             }
 
 #line default
 #line hidden
             WriteLiteral("        </div>\r\n\r\n        <div id=\"cookiespage\" class=\"page\">\r\n");
-#line 394 "ErrorPage.cshtml"
+#line 399 "ErrorPage.cshtml"
              if (Model.Cookies.Any())
             {
 
 #line default
 #line hidden
             WriteLiteral("                <table>\r\n                    <thead>\r\n                        <tr>\r\n                            <th>");
-#line 399 "ErrorPage.cshtml"
+#line 404 "ErrorPage.cshtml"
                            Write(Resources.ErrorPageHtml_VariableColumn);
 
 #line default
 #line hidden
             WriteLiteral("</th>\r\n                            <th>");
-#line 400 "ErrorPage.cshtml"
+#line 405 "ErrorPage.cshtml"
                            Write(Resources.ErrorPageHtml_ValueColumn);
 
 #line default
 #line hidden
             WriteLiteral("</th>\r\n                        </tr>\r\n                    </thead>\r\n                    <tbody>\r\n");
-#line 404 "ErrorPage.cshtml"
+#line 409 "ErrorPage.cshtml"
                          foreach (var kv in Model.Cookies.OrderBy(kv => kv.Key))
                         {
 
 #line default
 #line hidden
             WriteLiteral("                            <tr>\r\n                                <td>");
-#line 407 "ErrorPage.cshtml"
+#line 412 "ErrorPage.cshtml"
                                Write(kv.Key);
 
 #line default
 #line hidden
             WriteLiteral("</td>\r\n                                <td>");
-#line 408 "ErrorPage.cshtml"
+#line 413 "ErrorPage.cshtml"
                                Write(kv.Value);
 
 #line default
 #line hidden
             WriteLiteral("</td>\r\n                            </tr>\r\n");
-#line 410 "ErrorPage.cshtml"
+#line 415 "ErrorPage.cshtml"
                         }
 
 #line default
 #line hidden
             WriteLiteral("                    </tbody>\r\n                </table>\r\n");
-#line 413 "ErrorPage.cshtml"
+#line 418 "ErrorPage.cshtml"
             }
             else
             {
@@ -808,38 +815,38 @@ WriteAttributeValue("", 10304, exceptionDetailId, 10304, 18, false);
 #line default
 #line hidden
             WriteLiteral("                <p>");
-#line 416 "ErrorPage.cshtml"
+#line 421 "ErrorPage.cshtml"
               Write(Resources.ErrorPageHtml_NoCookieData);
 
 #line default
 #line hidden
             WriteLiteral("</p>\r\n");
-#line 417 "ErrorPage.cshtml"
+#line 422 "ErrorPage.cshtml"
             }
 
 #line default
 #line hidden
-            WriteLiteral("        </div>\r\n        <div id=\"headerspage\" class=\"page\">\r\n");
-#line 420 "ErrorPage.cshtml"
+            WriteLiteral("        </div>\r\n\r\n        <div id=\"headerspage\" class=\"page\">\r\n");
+#line 426 "ErrorPage.cshtml"
              if (Model.Headers.Any())
             {
 
 #line default
 #line hidden
             WriteLiteral("                <table>\r\n                    <thead>\r\n                        <tr>\r\n                            <th>");
-#line 425 "ErrorPage.cshtml"
+#line 431 "ErrorPage.cshtml"
                            Write(Resources.ErrorPageHtml_VariableColumn);
 
 #line default
 #line hidden
             WriteLiteral("</th>\r\n                            <th>");
-#line 426 "ErrorPage.cshtml"
+#line 432 "ErrorPage.cshtml"
                            Write(Resources.ErrorPageHtml_ValueColumn);
 
 #line default
 #line hidden
             WriteLiteral("</th>\r\n                        </tr>\r\n                    </thead>\r\n                    <tbody>\r\n");
-#line 430 "ErrorPage.cshtml"
+#line 436 "ErrorPage.cshtml"
                          foreach (var kv in Model.Headers.OrderBy(kv => kv.Key))
                         {
                             foreach (var v in kv.Value)
@@ -848,26 +855,26 @@ WriteAttributeValue("", 10304, exceptionDetailId, 10304, 18, false);
 #line default
 #line hidden
             WriteLiteral("                                <tr>\r\n                                    <td>");
-#line 435 "ErrorPage.cshtml"
+#line 441 "ErrorPage.cshtml"
                                    Write(kv.Key);
 
 #line default
 #line hidden
             WriteLiteral("</td>\r\n                                    <td>");
-#line 436 "ErrorPage.cshtml"
+#line 442 "ErrorPage.cshtml"
                                    Write(v);
 
 #line default
 #line hidden
             WriteLiteral("</td>\r\n                                </tr>\r\n");
-#line 438 "ErrorPage.cshtml"
+#line 444 "ErrorPage.cshtml"
                             }
                         }
 
 #line default
 #line hidden
             WriteLiteral("                    </tbody>\r\n                </table>\r\n");
-#line 442 "ErrorPage.cshtml"
+#line 448 "ErrorPage.cshtml"
             }
             else
             {
@@ -875,18 +882,219 @@ WriteAttributeValue("", 10304, exceptionDetailId, 10304, 18, false);
 #line default
 #line hidden
             WriteLiteral("                <p>");
-#line 445 "ErrorPage.cshtml"
+#line 451 "ErrorPage.cshtml"
               Write(Resources.ErrorPageHtml_NoHeaderData);
 
 #line default
 #line hidden
             WriteLiteral("</p>\r\n");
-#line 446 "ErrorPage.cshtml"
+#line 452 "ErrorPage.cshtml"
+            }
+
+#line default
+#line hidden
+            WriteLiteral("        </div>\r\n\r\n        <div id=\"routingpage\" class=\"page\">\r\n            <h2 class=\"subheader\">");
+#line 456 "ErrorPage.cshtml"
+                             Write(Resources.ErrorPageHtml_Endpoint);
+
+#line default
+#line hidden
+            WriteLiteral("</h2>\r\n");
+#line 457 "ErrorPage.cshtml"
+             if (Model.Endpoint != null)
+            {
+
+#line default
+#line hidden
+            WriteLiteral("                <table>\r\n                    <thead>\r\n                        <tr>\r\n                            <th>");
+#line 462 "ErrorPage.cshtml"
+                           Write(Resources.ErrorPageHtml_NameColumn);
+
+#line default
+#line hidden
+            WriteLiteral("</th>\r\n                            <th>");
+#line 463 "ErrorPage.cshtml"
+                           Write(Resources.ErrorPageHtml_ValueColumn);
+
+#line default
+#line hidden
+            WriteLiteral("</th>\r\n                        </tr>\r\n                    </thead>\r\n                    <tbody>\r\n                        <tr>\r\n                            <td>");
+#line 468 "ErrorPage.cshtml"
+                           Write(Resources.ErrorPageHtml_EndpointDisplayName);
+
+#line default
+#line hidden
+            WriteLiteral("</td>\r\n                            <td>");
+#line 469 "ErrorPage.cshtml"
+                           Write(Model.Endpoint.DisplayName);
+
+#line default
+#line hidden
+            WriteLiteral("</td>\r\n                        </tr>\r\n");
+#line 471 "ErrorPage.cshtml"
+                         if (!string.IsNullOrEmpty(Model.Endpoint.RoutePattern))
+                        {
+
+#line default
+#line hidden
+            WriteLiteral("                            <tr>\r\n                                <td>");
+#line 474 "ErrorPage.cshtml"
+                               Write(Resources.ErrorPageHtml_EndpointRoutePattern);
+
+#line default
+#line hidden
+            WriteLiteral("</td>\r\n                                <td>");
+#line 475 "ErrorPage.cshtml"
+                               Write(Model.Endpoint.RoutePattern);
+
+#line default
+#line hidden
+            WriteLiteral("</td>\r\n                            </tr>\r\n");
+#line 477 "ErrorPage.cshtml"
+                        }
+
+#line default
+#line hidden
+#line 478 "ErrorPage.cshtml"
+                         if (Model.Endpoint.Order != null)
+                        {
+
+#line default
+#line hidden
+            WriteLiteral("                            <tr>\r\n                                <td>");
+#line 481 "ErrorPage.cshtml"
+                               Write(Resources.ErrorPageHtml_EndpointRouteOrder);
+
+#line default
+#line hidden
+            WriteLiteral("</td>\r\n                                <td>");
+#line 482 "ErrorPage.cshtml"
+                               Write(Model.Endpoint.Order);
+
+#line default
+#line hidden
+            WriteLiteral("</td>\r\n                            </tr>\r\n");
+#line 484 "ErrorPage.cshtml"
+                        }
+
+#line default
+#line hidden
+#line 485 "ErrorPage.cshtml"
+                         if (!string.IsNullOrEmpty(Model.Endpoint.HttpMethods))
+                        {
+
+#line default
+#line hidden
+            WriteLiteral("                            <tr>\r\n                                <td>");
+#line 488 "ErrorPage.cshtml"
+                               Write(Resources.ErrorPageHtml_EndpointRouteHttpMethod);
+
+#line default
+#line hidden
+            WriteLiteral("</td>\r\n                                <td>");
+#line 489 "ErrorPage.cshtml"
+                               Write(Model.Endpoint.HttpMethods);
+
+#line default
+#line hidden
+            WriteLiteral("</td>\r\n                            </tr>\r\n");
+#line 491 "ErrorPage.cshtml"
+                        }
+
+#line default
+#line hidden
+            WriteLiteral("                    </tbody>\r\n                </table>\r\n");
+#line 494 "ErrorPage.cshtml"
+            }
+            else
+            {
+
+#line default
+#line hidden
+            WriteLiteral("                <p>");
+#line 497 "ErrorPage.cshtml"
+              Write(Resources.ErrorPageHtml_NoEndpoint);
+
+#line default
+#line hidden
+            WriteLiteral("</p>\r\n");
+#line 498 "ErrorPage.cshtml"
+            }
+
+#line default
+#line hidden
+            WriteLiteral("            <h2 class=\"subheader\">");
+#line 499 "ErrorPage.cshtml"
+                             Write(Resources.ErrorPageHtml_RouteValues);
+
+#line default
+#line hidden
+            WriteLiteral("</h2>\r\n");
+#line 500 "ErrorPage.cshtml"
+             if (Model.RouteValues != null && Model.RouteValues.Any())
+            {
+
+#line default
+#line hidden
+            WriteLiteral("                <table>\r\n                    <thead>\r\n                        <tr>\r\n                            <th>");
+#line 505 "ErrorPage.cshtml"
+                           Write(Resources.ErrorPageHtml_VariableColumn);
+
+#line default
+#line hidden
+            WriteLiteral("</th>\r\n                            <th>");
+#line 506 "ErrorPage.cshtml"
+                           Write(Resources.ErrorPageHtml_ValueColumn);
+
+#line default
+#line hidden
+            WriteLiteral("</th>\r\n                        </tr>\r\n                    </thead>\r\n                    <tbody>\r\n");
+#line 510 "ErrorPage.cshtml"
+                         foreach (var kv in Model.RouteValues.OrderBy(kv => kv.Key))
+                        {
+
+#line default
+#line hidden
+            WriteLiteral("                            <tr>\r\n                                <td>");
+#line 513 "ErrorPage.cshtml"
+                               Write(kv.Key);
+
+#line default
+#line hidden
+            WriteLiteral("</td>\r\n                                <td>");
+#line 514 "ErrorPage.cshtml"
+                               Write(kv.Value);
+
+#line default
+#line hidden
+            WriteLiteral("</td>\r\n                            </tr>\r\n");
+#line 516 "ErrorPage.cshtml"
+                        }
+
+#line default
+#line hidden
+            WriteLiteral("                    </tbody>\r\n                </table>\r\n");
+#line 519 "ErrorPage.cshtml"
+            }
+            else
+            {
+
+#line default
+#line hidden
+            WriteLiteral("                <p>");
+#line 522 "ErrorPage.cshtml"
+              Write(Resources.ErrorPageHtml_NoRouteValues);
+
+#line default
+#line hidden
+            WriteLiteral("</p>\r\n");
+#line 523 "ErrorPage.cshtml"
             }
 
 #line default
 #line hidden
             WriteLiteral(@"        </div>
+
         <script>
             //<!--
             (function (window, undefined) {
@@ -922,8 +1130,8 @@ WriteAttributeValue("", 10304, exceptionDetailId, 10304, 18, false);
             var children = [];
 
             this.each(function (el) {
-                children = children.concat(");
-            WriteLiteral(@"ns(selector, el).items);
+                children = children.conca");
+            WriteLiteral(@"t(ns(selector, el).items);
             });
 
             return ns(children);
@@ -961,8 +1169,8 @@ WriteAttributeValue("", 10304, exceptionDetailId, 10304, 18, false);
                     el.className = className;
                 } else {
                     classNames = existingClassName.split("" "");
-                    if (classNames.i");
-            WriteLiteral(@"ndexOf(className) < 0) {
+                    if (classNames");
+            WriteLiteral(@".indexOf(className) < 0) {
                         el.className = existingClassName + "" "" + className;
                     }
                 }
@@ -993,8 +1201,8 @@ WriteAttributeValue("", 10304, exceptionDetailId, 10304, 18, false);
         attr: function (name) {
             if (this.items.length === 0) {
                 return null;
-          ");
-            WriteLiteral(@"  }
+        ");
+            WriteLiteral(@"    }
 
             return this.items[0].getAttribute(name);
         },
@@ -1026,8 +1234,8 @@ WriteAttributeValue("", 10304, exceptionDetailId, 10304, 18, false);
         },
 
         keypress: function (handler) {
-           ");
-            WriteLiteral(@" return this.on(""keypress"", handler);
+         ");
+            WriteLiteral(@"   return this.on(""keypress"", handler);
         }
     };
 
@@ -1064,8 +1272,8 @@ WriteAttributeValue("", 10304, exceptionDetailId, 10304, 18, false);
             expandCollapseButton(this);
         })
         .keypress(function (e) {
-            if (e");
-            WriteLiteral(@".which === 13) {
+            if ");
+            WriteLiteral(@"(e.which === 13) {
                 expandCollapseButton(this);
             }
         });
diff --git a/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/ErrorPage.cshtml b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/ErrorPage.cshtml
index 3d0a28e8ef..b3f77a097e 100644
--- a/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/ErrorPage.cshtml
+++ b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/ErrorPage.cshtml
@@ -1,4 +1,4 @@
-@using System
+@using System
 @using System.Globalization
 @using System.Linq
 @using System.Net
@@ -33,7 +33,7 @@
         @foreach (var errorDetail in Model.ErrorDetails)
         {
             <div class="titleerror">@errorDetail.Error.GetType().Name: @{ Output.Write(HtmlEncodeAndReplaceLineBreaks(errorDetail.Error.Message)); }</div>
-            
+
             var firstFrame = errorDetail.StackFrames.FirstOrDefault();
             if (firstFrame != null)
             {
@@ -80,6 +80,9 @@
             <li id="headers" tabindex="4">
                 @Resources.ErrorPageHtml_HeadersButton
             </li>
+            <li id="routing" tabindex="5">
+                @Resources.ErrorPageHtml_RoutingButton
+            </li>
         </ul>
 
         <div id="stackpage" class="page">
@@ -98,59 +101,59 @@
                     <li>
                         <h2 class="stackerror">@errorDetail.Error.GetType().Name: @errorDetail.Error.Message</h2>
                         <ul>
-                        @foreach (var frame in errorDetail.StackFrames)
-                        {
-                            stackFrameCount++;
-                            frameId = "frame" + stackFrameCount;
+                            @foreach (var frame in errorDetail.StackFrames)
+                            {
+                                stackFrameCount++;
+                                frameId = "frame" + stackFrameCount;
 
-                            <li class="frame" id="@frameId">
-                                @if (string.IsNullOrEmpty(frame.File))
-                                {
-                                    <h3>@frame.Function</h3>
-                                }
-                                else
-                                {
-                                    <h3>@frame.Function in <code title="@frame.File">@System.IO.Path.GetFileName(frame.File)</code></h3>
-                                }
+                                <li class="frame" id="@frameId">
+                                    @if (string.IsNullOrEmpty(frame.File))
+                                    {
+                                        <h3>@frame.Function</h3>
+                                    }
+                                    else
+                                    {
+                                        <h3>@frame.Function in <code title="@frame.File">@System.IO.Path.GetFileName(frame.File)</code></h3>
+                                    }
 
-                                @if (frame.Line != 0 && frame.ContextCode.Any())
-                                {
-                                    <button class="expandCollapseButton" data-frameId="@frameId">+</button>
-                                    <div class="source">
-                                        @if (frame.PreContextCode.Any())
-                                        {
-                                            <ol start="@frame.PreContextLine" class="collapsible">
-                                                @foreach (var line in frame.PreContextCode)
-                                                {
-                                                    <li><span>@line</span></li>
-                                                }
-                                            </ol>
-                                        }
-
-                                        <ol start="@frame.Line" class="highlight">
-                                            @foreach (var line in frame.ContextCode)
+                                    @if (frame.Line != 0 && frame.ContextCode.Any())
+                                    {
+                                        <button class="expandCollapseButton" data-frameId="@frameId">+</button>
+                                        <div class="source">
+                                            @if (frame.PreContextCode.Any())
                                             {
-                                                <li><span>@line</span></li>
+                                                <ol start="@frame.PreContextLine" class="collapsible">
+                                                    @foreach (var line in frame.PreContextCode)
+                                                    {
+                                                        <li><span>@line</span></li>
+                                                    }
+                                                </ol>
                                             }
-                                        </ol>
 
-                                        @if (frame.PostContextCode.Any())
-                                        {
-                                            <ol start='@(frame.Line + 1)' class="collapsible">
-                                                @foreach (var line in frame.PostContextCode)
+                                            <ol start="@frame.Line" class="highlight">
+                                                @foreach (var line in frame.ContextCode)
                                                 {
                                                     <li><span>@line</span></li>
                                                 }
                                             </ol>
-                                        }
-                                    </div>
-                                }
-                            </li>
-                        }
+
+                                            @if (frame.PostContextCode.Any())
+                                            {
+                                                <ol start='@(frame.Line + 1)' class="collapsible">
+                                                    @foreach (var line in frame.PostContextCode)
+                                                    {
+                                                        <li><span>@line</span></li>
+                                                    }
+                                                </ol>
+                                            }
+                                        </div>
+                                    }
+                                </li>
+                            }
                         </ul>
                     </li>
                     <li>
-                        <br/>
+                        <br />
                         <div class="rawExceptionBlock">
                             <div class="showRawExceptionContainer">
                                 <button class="showRawException" data-exceptionDetailId="@exceptionDetailId">Show raw exception details</button>
@@ -220,6 +223,7 @@
                 <p>@Resources.ErrorPageHtml_NoCookieData</p>
             }
         </div>
+
         <div id="headerspage" class="page">
             @if (Model.Headers.Any())
             {
@@ -249,6 +253,78 @@
                 <p>@Resources.ErrorPageHtml_NoHeaderData</p>
             }
         </div>
+
+        <div id="routingpage" class="page">
+            <h2 class="subheader">@Resources.ErrorPageHtml_Endpoint</h2>
+            @if (Model.Endpoint != null)
+            {
+                <table>
+                    <thead>
+                        <tr>
+                            <th>@Resources.ErrorPageHtml_NameColumn</th>
+                            <th>@Resources.ErrorPageHtml_ValueColumn</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr>
+                            <td>@Resources.ErrorPageHtml_EndpointDisplayName</td>
+                            <td>@Model.Endpoint.DisplayName</td>
+                        </tr>
+                        @if (!string.IsNullOrEmpty(Model.Endpoint.RoutePattern))
+                        {
+                            <tr>
+                                <td>@Resources.ErrorPageHtml_EndpointRoutePattern</td>
+                                <td>@Model.Endpoint.RoutePattern</td>
+                            </tr>
+                        }
+                        @if (Model.Endpoint.Order != null)
+                        {
+                            <tr>
+                                <td>@Resources.ErrorPageHtml_EndpointRouteOrder</td>
+                                <td>@Model.Endpoint.Order</td>
+                            </tr>
+                        }
+                        @if (!string.IsNullOrEmpty(Model.Endpoint.HttpMethods))
+                        {
+                            <tr>
+                                <td>@Resources.ErrorPageHtml_EndpointRouteHttpMethod</td>
+                                <td>@Model.Endpoint.HttpMethods</td>
+                            </tr>
+                        }
+                    </tbody>
+                </table>
+            }
+            else
+            {
+                <p>@Resources.ErrorPageHtml_NoEndpoint</p>
+            }
+            <h2 class="subheader">@Resources.ErrorPageHtml_RouteValues</h2>
+            @if (Model.RouteValues != null && Model.RouteValues.Any())
+            {
+                <table>
+                    <thead>
+                        <tr>
+                            <th>@Resources.ErrorPageHtml_VariableColumn</th>
+                            <th>@Resources.ErrorPageHtml_ValueColumn</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach (var kv in Model.RouteValues.OrderBy(kv => kv.Key))
+                        {
+                            <tr>
+                                <td>@kv.Key</td>
+                                <td>@kv.Value</td>
+                            </tr>
+                        }
+                    </tbody>
+                </table>
+            }
+            else
+            {
+                <p>@Resources.ErrorPageHtml_NoRouteValues</p>
+            }
+        </div>
+
         <script>
             //<!--
             <%$ include: ErrorPage.js %>
diff --git a/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/ErrorPage.css b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/ErrorPage.css
index 8472e11957..54e66c97af 100644
--- a/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/ErrorPage.css
+++ b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/ErrorPage.css
@@ -1,4 +1,4 @@
-body {
+body {
     font-family: 'Segoe UI', Tahoma, Arial, Helvetica, sans-serif;
     font-size: .813em;
     color: #222;
@@ -108,6 +108,11 @@ body .location {
         color: #606060;
     }
 
+#routingpage .subheader {
+    padding: 5px;
+    border-bottom: 1px #ddd solid;
+}
+
 .page table {
     border-collapse: separate;
     border-spacing: 0;
diff --git a/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/ErrorPageModel.cs b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/ErrorPageModel.cs
index cb9c213a39..0a66638a0c 100644
--- a/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/ErrorPageModel.cs
+++ b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/ErrorPageModel.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.Primitives;
 using Microsoft.Extensions.StackTrace.Sources;
 
@@ -38,5 +39,15 @@ namespace Microsoft.AspNetCore.Diagnostics.RazorViews
         /// Request headers.
         /// </summary>
         public IDictionary<string, StringValues> Headers { get; set; }
+
+        /// <summary>
+        /// Request route values.
+        /// </summary>
+        public RouteValueDictionary RouteValues { get; set; }
+
+        /// <summary>
+        /// Request endpoint.
+        /// </summary>
+        public EndpointModel Endpoint { get; set; }
     }
 }
diff --git a/src/Middleware/Diagnostics/src/Microsoft.AspNetCore.Diagnostics.csproj b/src/Middleware/Diagnostics/src/Microsoft.AspNetCore.Diagnostics.csproj
index 4301e6af10..775fe57a6a 100644
--- a/src/Middleware/Diagnostics/src/Microsoft.AspNetCore.Diagnostics.csproj
+++ b/src/Middleware/Diagnostics/src/Microsoft.AspNetCore.Diagnostics.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Description>ASP.NET Core middleware for exception handling, exception display pages, and diagnostics information. Includes developer exception page middleware, exception handler middleware, runtime info middleware, status code page middleware, and welcome page middleware</Description>
@@ -18,6 +18,7 @@
     <Reference Include="Microsoft.AspNetCore.Diagnostics.Abstractions" />
     <Reference Include="Microsoft.AspNetCore.Hosting.Abstractions" />
     <Reference Include="Microsoft.AspNetCore.Http.Extensions" />
+    <Reference Include="Microsoft.AspNetCore.Routing" />
     <Reference Include="Microsoft.AspNetCore.WebUtilities" />
     <Reference Include="Microsoft.Extensions.FileProviders.Physical" />
     <Reference Include="Microsoft.Extensions.Logging.Abstractions" />
diff --git a/src/Middleware/Diagnostics/src/Properties/Resources.Designer.cs b/src/Middleware/Diagnostics/src/Properties/Resources.Designer.cs
index a9ca25fef3..5895c48b74 100644
--- a/src/Middleware/Diagnostics/src/Properties/Resources.Designer.cs
+++ b/src/Middleware/Diagnostics/src/Properties/Resources.Designer.cs
@@ -123,7 +123,7 @@ namespace Microsoft.AspNetCore.Diagnostics
             => GetString("ErrorPageHtml_NoHeaderData");
 
         /// <summary>
-        /// No QueryString data.
+        /// No query string data.
         /// </summary>
         internal static string ErrorPageHtml_NoQueryStringData
         {
@@ -131,7 +131,7 @@ namespace Microsoft.AspNetCore.Diagnostics
         }
 
         /// <summary>
-        /// No QueryString data.
+        /// No query string data.
         /// </summary>
         internal static string FormatErrorPageHtml_NoQueryStringData()
             => GetString("ErrorPageHtml_NoQueryStringData");
@@ -598,6 +598,146 @@ namespace Microsoft.AspNetCore.Diagnostics
         internal static string FormatExceptionHandlerOptions_NotConfiguredCorrectly()
             => GetString("ExceptionHandlerOptions_NotConfiguredCorrectly");
 
+        /// <summary>
+        /// No route values.
+        /// </summary>
+        internal static string ErrorPageHtml_NoRouteValues
+        {
+            get => GetString("ErrorPageHtml_NoRouteValues");
+        }
+
+        /// <summary>
+        /// No route values.
+        /// </summary>
+        internal static string FormatErrorPageHtml_NoRouteValues()
+            => GetString("ErrorPageHtml_NoRouteValues");
+
+        /// <summary>
+        /// Routing
+        /// </summary>
+        internal static string ErrorPageHtml_RoutingButton
+        {
+            get => GetString("ErrorPageHtml_RoutingButton");
+        }
+
+        /// <summary>
+        /// Routing
+        /// </summary>
+        internal static string FormatErrorPageHtml_RoutingButton()
+            => GetString("ErrorPageHtml_RoutingButton");
+
+        /// <summary>
+        /// Endpoint
+        /// </summary>
+        internal static string ErrorPageHtml_Endpoint
+        {
+            get => GetString("ErrorPageHtml_Endpoint");
+        }
+
+        /// <summary>
+        /// Endpoint
+        /// </summary>
+        internal static string FormatErrorPageHtml_Endpoint()
+            => GetString("ErrorPageHtml_Endpoint");
+
+        /// <summary>
+        /// Display Name
+        /// </summary>
+        internal static string ErrorPageHtml_EndpointDisplayName
+        {
+            get => GetString("ErrorPageHtml_EndpointDisplayName");
+        }
+
+        /// <summary>
+        /// Display Name
+        /// </summary>
+        internal static string FormatErrorPageHtml_EndpointDisplayName()
+            => GetString("ErrorPageHtml_EndpointDisplayName");
+
+        /// <summary>
+        /// Route Order
+        /// </summary>
+        internal static string ErrorPageHtml_EndpointRouteOrder
+        {
+            get => GetString("ErrorPageHtml_EndpointRouteOrder");
+        }
+
+        /// <summary>
+        /// Route Order
+        /// </summary>
+        internal static string FormatErrorPageHtml_EndpointRouteOrder()
+            => GetString("ErrorPageHtml_EndpointRouteOrder");
+
+        /// <summary>
+        /// Route HTTP Method
+        /// </summary>
+        internal static string ErrorPageHtml_EndpointRouteHttpMethod
+        {
+            get => GetString("ErrorPageHtml_EndpointRouteHttpMethod");
+        }
+
+        /// <summary>
+        /// Route HTTP Method
+        /// </summary>
+        internal static string FormatErrorPageHtml_EndpointRouteHttpMethod()
+            => GetString("ErrorPageHtml_EndpointRouteHttpMethod");
+
+        /// <summary>
+        /// Route Pattern
+        /// </summary>
+        internal static string ErrorPageHtml_EndpointRoutePattern
+        {
+            get => GetString("ErrorPageHtml_EndpointRoutePattern");
+        }
+
+        /// <summary>
+        /// Route Pattern
+        /// </summary>
+        internal static string FormatErrorPageHtml_EndpointRoutePattern()
+            => GetString("ErrorPageHtml_EndpointRoutePattern");
+
+        /// <summary>
+        /// No endpoint.
+        /// </summary>
+        internal static string ErrorPageHtml_NoEndpoint
+        {
+            get => GetString("ErrorPageHtml_NoEndpoint");
+        }
+
+        /// <summary>
+        /// No endpoint.
+        /// </summary>
+        internal static string FormatErrorPageHtml_NoEndpoint()
+            => GetString("ErrorPageHtml_NoEndpoint");
+
+        /// <summary>
+        /// Route Values
+        /// </summary>
+        internal static string ErrorPageHtml_RouteValues
+        {
+            get => GetString("ErrorPageHtml_RouteValues");
+        }
+
+        /// <summary>
+        /// Route Values
+        /// </summary>
+        internal static string FormatErrorPageHtml_RouteValues()
+            => GetString("ErrorPageHtml_RouteValues");
+
+        /// <summary>
+        /// Name
+        /// </summary>
+        internal static string ErrorPageHtml_NameColumn
+        {
+            get => GetString("ErrorPageHtml_NameColumn");
+        }
+
+        /// <summary>
+        /// Name
+        /// </summary>
+        internal static string FormatErrorPageHtml_NameColumn()
+            => GetString("ErrorPageHtml_NameColumn");
+
         private static string GetString(string name, params string[] formatterNames)
         {
             var value = _resourceManager.GetString(name);
diff --git a/src/Middleware/Diagnostics/src/README.md b/src/Middleware/Diagnostics/src/README.md
new file mode 100644
index 0000000000..b3e72bdd68
--- /dev/null
+++ b/src/Middleware/Diagnostics/src/README.md
@@ -0,0 +1,12 @@
+ASP.NET Core Diagnostics
+===
+
+## Development
+
+Diagnostics middleware like `DeveloperExceptionPage` uses compiled Razor views. After updating the `*.cshtml` file you must run the [RazorPageGenerator](https://github.com/aspnet/AspNetCore-Tooling/tree/master/src/Razor/src/RazorPageGenerator) tool to generate an updated compiled Razor view.
+
+Run the following command in `AspNetCore-Tooling\src\Razor\src\RazorPageGenerator`:
+
+```
+dotnet run Microsoft.AspNetCore.Diagnostics.RazorViews path-to-aspnetcore-middleware-diagnostics-src
+```
\ No newline at end of file
diff --git a/src/Middleware/Diagnostics/src/Resources.resx b/src/Middleware/Diagnostics/src/Resources.resx
index 93a94abe1a..8cd9b2ea53 100644
--- a/src/Middleware/Diagnostics/src/Resources.resx
+++ b/src/Middleware/Diagnostics/src/Resources.resx
@@ -144,7 +144,7 @@
     <value>No header data.</value>
   </data>
   <data name="ErrorPageHtml_NoQueryStringData" xml:space="preserve">
-    <value>No QueryString data.</value>
+    <value>No query string data.</value>
   </data>
   <data name="ErrorPageHtml_QueryButton" xml:space="preserve">
     <value>Query</value>
@@ -250,4 +250,34 @@
   <data name="ExceptionHandlerOptions_NotConfiguredCorrectly" xml:space="preserve">
     <value>An error occurred when configuring the exception handler middleware. Either the 'ExceptionHandlingPath' or the 'ExceptionHandler' option must be set in 'UseExceptionHandler()'.</value>
   </data>
+  <data name="ErrorPageHtml_NoRouteValues" xml:space="preserve">
+    <value>No route values.</value>
+  </data>
+  <data name="ErrorPageHtml_RoutingButton" xml:space="preserve">
+    <value>Routing</value>
+  </data>
+  <data name="ErrorPageHtml_Endpoint" xml:space="preserve">
+    <value>Endpoint</value>
+  </data>
+  <data name="ErrorPageHtml_EndpointDisplayName" xml:space="preserve">
+    <value>Display Name</value>
+  </data>
+  <data name="ErrorPageHtml_EndpointRouteOrder" xml:space="preserve">
+    <value>Route Order</value>
+  </data>
+  <data name="ErrorPageHtml_EndpointRouteHttpMethod" xml:space="preserve">
+    <value>Route HTTP Method</value>
+  </data>
+  <data name="ErrorPageHtml_EndpointRoutePattern" xml:space="preserve">
+    <value>Route Pattern</value>
+  </data>
+  <data name="ErrorPageHtml_NoEndpoint" xml:space="preserve">
+    <value>No endpoint.</value>
+  </data>
+  <data name="ErrorPageHtml_RouteValues" xml:space="preserve">
+    <value>Route Values</value>
+  </data>
+  <data name="ErrorPageHtml_NameColumn" xml:space="preserve">
+    <value>Name</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Middleware/Diagnostics/test/testassets/DeveloperExceptionPageSample/DeveloperExceptionPageSample.csproj b/src/Middleware/Diagnostics/test/testassets/DeveloperExceptionPageSample/DeveloperExceptionPageSample.csproj
index 3c714fe27c..6728950059 100644
--- a/src/Middleware/Diagnostics/test/testassets/DeveloperExceptionPageSample/DeveloperExceptionPageSample.csproj
+++ b/src/Middleware/Diagnostics/test/testassets/DeveloperExceptionPageSample/DeveloperExceptionPageSample.csproj
@@ -9,6 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.Routing" />
     <Reference Include="Microsoft.AspNetCore.Server.IISIntegration" />
     <Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
   </ItemGroup>
diff --git a/src/Middleware/Diagnostics/test/testassets/DeveloperExceptionPageSample/Startup.cs b/src/Middleware/Diagnostics/test/testassets/DeveloperExceptionPageSample/Startup.cs
index 4da64e1fbe..5c29a13da8 100644
--- a/src/Middleware/Diagnostics/test/testassets/DeveloperExceptionPageSample/Startup.cs
+++ b/src/Middleware/Diagnostics/test/testassets/DeveloperExceptionPageSample/Startup.cs
@@ -1,6 +1,14 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
 using System;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Endpoints;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Routing.Patterns;
 
 namespace DeveloperExceptionPageSample
 {
@@ -8,6 +16,24 @@ namespace DeveloperExceptionPageSample
     {
         public void Configure(IApplicationBuilder app)
         {
+            app.Use((context, next) =>
+            {
+                context.Request.RouteValues = new RouteValueDictionary(new
+                {
+                    routeValue1 = "Value1",
+                    routeValue2 = "Value2",
+                });
+
+                var endpoint = new RouteEndpoint(
+                    c => null,
+                    RoutePatternFactory.Parse("/"),
+                    0,
+                    new EndpointMetadataCollection(new HttpMethodMetadata(new[] { "GET", "POST" })),
+                    "Endpoint display name");
+
+                context.SetEndpoint(endpoint);
+                return next();
+            });
             app.UseDeveloperExceptionPage();
             app.Run(context =>
             {