diff --git a/src/Microsoft.AspNet.Diagnostics/Compilation/ICompilationException.cs b/src/Microsoft.AspNet.Diagnostics/Compilation/ICompilationException.cs
new file mode 100644
index 0000000000..ba9102a35b
--- /dev/null
+++ b/src/Microsoft.AspNet.Diagnostics/Compilation/ICompilationException.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using Microsoft.Framework.Runtime;
+
+namespace Microsoft.AspNet.Diagnostics
+{
+    /// <summary>
+    /// Specifies the contract for an exception representing compilation failure.
+    /// </summary>
+    [AssemblyNeutral]
+    public interface ICompilationException
+    {
+        /// <summary>
+        /// Gets a sequence of <see cref="ICompilationFailure"/> with compilation failures.
+        /// </summary>
+        IEnumerable<ICompilationFailure> CompilationFailures { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Diagnostics/Compilation/ICompilationFailure.cs b/src/Microsoft.AspNet.Diagnostics/Compilation/ICompilationFailure.cs
new file mode 100644
index 0000000000..bf16458fc6
--- /dev/null
+++ b/src/Microsoft.AspNet.Diagnostics/Compilation/ICompilationFailure.cs
@@ -0,0 +1,40 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using Microsoft.Framework.Runtime;
+
+namespace Microsoft.AspNet.Diagnostics
+{
+    /// <summary>
+    /// Specifies the contract for a file that fails compilation.
+    /// </summary>
+    [AssemblyNeutral]
+    public interface ICompilationFailure
+    {
+        /// <summary>
+        /// Path of the file that produced the compilation exception.
+        /// </summary>
+        string SourceFilePath { get; }
+
+        /// <summary>
+        /// Contents of the file.
+        /// </summary>
+        string SourceFileContent { get; }
+
+        /// <summary>
+        /// Contents being compiled.
+        /// </summary>
+        /// <remarks>
+        /// For templated files, the <see cref="SourceFileContent"/> represents the original content and
+        /// <see cref="CompiledContent"/> represents the transformed content. This property can be null if
+        /// the exception is encountered during transformation.
+        /// </remarks>
+        string CompiledContent { get; }
+
+        /// <summary>
+        /// Gets a sequence of <see cref="ICompilationMessage"/> produced as a result of compilation.
+        /// </summary>
+        IEnumerable<ICompilationMessage> Messages { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Diagnostics/Compilation/ICompilationMessage.cs b/src/Microsoft.AspNet.Diagnostics/Compilation/ICompilationMessage.cs
new file mode 100644
index 0000000000..ed3ca5fed8
--- /dev/null
+++ b/src/Microsoft.AspNet.Diagnostics/Compilation/ICompilationMessage.cs
@@ -0,0 +1,40 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.Framework.Runtime;
+
+namespace Microsoft.AspNet.Diagnostics
+{
+    /// <summary>
+    /// Specifies the contract for diagnostic messages produced as result of compiling an instance
+    /// of <see cref="ICompilationFailure"/>.
+    /// </summary>
+    [AssemblyNeutral]
+    public interface ICompilationMessage
+    {
+        /// <summary>
+        /// Gets the error message.
+        /// </summary>
+        string Message { get; }
+
+        /// <summary>
+        /// Gets the zero-based line index for the start of the compilation error.
+        /// </summary>
+        int StartLine { get; }
+
+        /// <summary>
+        /// Gets the zero-based column index for the start of the compilation error.
+        /// </summary>
+        int StartColumn { get; }
+
+        /// <summary>
+        /// Gets the zero-based line index for the end of the compilation error.
+        /// </summary>
+        int EndLine { get; }
+
+        /// <summary>
+        /// Gets the zero-based column index for the end of the compilation error.
+        /// </summary>
+        int EndColumn { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Diagnostics/ErrorPageMiddleware.cs b/src/Microsoft.AspNet.Diagnostics/ErrorPageMiddleware.cs
index d872d65f04..aa8851bcc0 100644
--- a/src/Microsoft.AspNet.Diagnostics/ErrorPageMiddleware.cs
+++ b/src/Microsoft.AspNet.Diagnostics/ErrorPageMiddleware.cs
@@ -76,7 +76,70 @@ namespace Microsoft.AspNet.Diagnostics
         }
 
         // Assumes the response headers have not been sent.  If they have, still attempt to write to the body.
-        private async Task DisplayException(HttpContext context, Exception ex)
+        private Task DisplayException(HttpContext context, Exception ex)
+        {
+            var compilationException = ex as ICompilationException;
+            if (compilationException != null)
+            {
+                return DisplayCompilationException(context, ex, compilationException);
+            }
+
+            return DisplayRuntimeException(context, ex);
+        }
+
+        private Task DisplayCompilationException(HttpContext context,
+                                                 Exception ex,
+                                                 ICompilationException compilationException)
+        {
+            var stackFrames = new List<StackFrame>();
+            var model = new CompilationErrorPageModel()
+            {
+                Options = _options,
+                ErrorDetails = new ErrorDetails
+                {
+                    Error = ex,
+                    StackFrames = stackFrames
+                }
+            };
+
+            // For view compilation, the most common case is to stop at the first failing file compiled as part of
+            // rendering a view. Consequently we'll limit ourselves to displaying errors from the first failure.
+            var failedCompilationFile = compilationException.CompilationFailures.FirstOrDefault();
+            if (failedCompilationFile != null)
+            {
+                var fileContent = failedCompilationFile.SourceFileContent
+                                                       .Split(new[] { Environment.NewLine }, StringSplitOptions.None);
+
+                foreach (var item in failedCompilationFile.Messages)
+                {
+                    // Convert 0-based line indexes to 1-based index that the StackFrame expects
+                    var lineIndex = item.StartLine + 1;
+                    var frame = new StackFrame
+                    {
+                        File = failedCompilationFile.SourceFilePath,
+                        Line = lineIndex,
+                        Function = string.Empty
+                    };
+
+                    if (_options.ShowSourceCode)
+                    {
+                        ReadFrameContent(frame, fileContent, lineIndex, item.EndLine + 1);
+                        frame.ErrorDetails = item.Message;
+                    }
+
+                    stackFrames.Add(frame);
+                }
+            }
+
+            var errorPage = new CompilationErrorPage
+            {
+                Model = model
+            };
+
+            return errorPage.ExecuteAsync(context);
+        }
+
+        private Task DisplayRuntimeException(HttpContext context, Exception ex)
         {
             var request = context.Request;
 
@@ -107,7 +170,7 @@ namespace Microsoft.AspNet.Diagnostics
             }*/
 
             var errorPage = new ErrorPage(model);
-            await errorPage.ExecuteAsync(context);
+            return errorPage.ExecuteAsync(context);
         }
 
         private IEnumerable<ErrorDetails> GetErrorDetails(Exception ex, bool showSource)
@@ -160,14 +223,22 @@ namespace Microsoft.AspNet.Diagnostics
             if (showSource && File.Exists(file))
             {
                 IEnumerable<string> code = File.ReadLines(file);
-                frame.PreContextLine = Math.Max(lineNumber - _options.SourceCodeLineCount, 1);
-                frame.PreContextCode = code.Skip(frame.PreContextLine - 1).Take(lineNumber - frame.PreContextLine).ToArray();
-                frame.ContextCode = code.Skip(lineNumber - 1).FirstOrDefault();
-                frame.PostContextCode = code.Skip(lineNumber).Take(_options.SourceCodeLineCount).ToArray();
+                ReadFrameContent(frame, code, lineNumber, lineNumber);
             }
             return frame;
         }
 
+        private void ReadFrameContent(StackFrame frame,
+                                      IEnumerable<string> code,
+                                      int startLineNumber,
+                                      int endLineNumber)
+        {
+            frame.PreContextLine = Math.Max(startLineNumber - _options.SourceCodeLineCount, 1);
+            frame.PreContextCode = code.Skip(frame.PreContextLine - 1).Take(startLineNumber - frame.PreContextLine).ToArray();
+            frame.ContextCode = code.Skip(startLineNumber - 1).Take(1 + Math.Max(0, endLineNumber - startLineNumber));
+            frame.PostContextCode = code.Skip(startLineNumber).Take(_options.SourceCodeLineCount).ToArray();
+        }
+
         internal class Chunk
         {
             public string Text { get; set; }
diff --git a/src/Microsoft.AspNet.Diagnostics/Properties/Resources.Designer.cs b/src/Microsoft.AspNet.Diagnostics/Properties/Resources.Designer.cs
index 151b1aa94f..9ac48701ad 100644
--- a/src/Microsoft.AspNet.Diagnostics/Properties/Resources.Designer.cs
+++ b/src/Microsoft.AspNet.Diagnostics/Properties/Resources.Designer.cs
@@ -379,7 +379,7 @@ namespace Microsoft.AspNet.Diagnostics
         }
 
         /// <summary>
-        /// Name
+        /// Version
         /// </summary>
         internal static string RuntimeInfoPage_PackageVersionColumnName
         {
@@ -387,7 +387,7 @@ namespace Microsoft.AspNet.Diagnostics
         }
 
         /// <summary>
-        /// Name
+        /// Version
         /// </summary>
         internal static string FormatRuntimeInfoPage_PackageVersionColumnName()
         {
@@ -570,6 +570,22 @@ namespace Microsoft.AspNet.Diagnostics
             return GetString("WelcomeTitle");
         }
 
+        /// <summary>
+        /// An error occurred during the compilation of a resource required to process this request. Please review the following specific error details and modify your source code appropriately.
+        /// </summary>
+        internal static string ErrorPageHtml_CompilationException
+        {
+            get { return GetString("ErrorPageHtml_CompilationException"); }
+        }
+
+        /// <summary>
+        /// An error occurred during the compilation of a resource required to process this request. Please review the following specific error details and modify your source code appropriately.
+        /// </summary>
+        internal static string FormatErrorPageHtml_CompilationException()
+        {
+            return GetString("ErrorPageHtml_CompilationException");
+        }
+
         private static string GetString(string name, params string[] formatterNames)
         {
             var value = _resourceManager.GetString(name);
diff --git a/src/Microsoft.AspNet.Diagnostics/Resources.resx b/src/Microsoft.AspNet.Diagnostics/Resources.resx
index a56b82ed1d..98190423f4 100644
--- a/src/Microsoft.AspNet.Diagnostics/Resources.resx
+++ b/src/Microsoft.AspNet.Diagnostics/Resources.resx
@@ -230,4 +230,7 @@
   <data name="WelcomeTitle" xml:space="preserve">
     <value>Your ASP.NET vNext application has been successfully started.</value>
   </data>
+  <data name="ErrorPageHtml_CompilationException" xml:space="preserve">
+    <value>An error occurred during the compilation of a resource required to process this request. Please review the following specific error details and modify your source code appropriately.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Diagnostics/Views/CompilationErrorModel.cs b/src/Microsoft.AspNet.Diagnostics/Views/CompilationErrorModel.cs
new file mode 100644
index 0000000000..fed8231c1b
--- /dev/null
+++ b/src/Microsoft.AspNet.Diagnostics/Views/CompilationErrorModel.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+
+namespace Microsoft.AspNet.Diagnostics.Views
+{
+    /// <summary>
+    /// Holds data to be displayed on the compilation error page.
+    /// </summary>
+    public class CompilationErrorPageModel
+    {
+        /// <summary>
+        /// Options for what output to display.
+        /// </summary>
+        public ErrorPageOptions Options { get; set; }
+
+        /// <summary>
+        /// Detailed information about each parse or compilation error.
+        /// </summary>
+        public ErrorDetails ErrorDetails { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Diagnostics/Views/CompilationErrorPage.cs b/src/Microsoft.AspNet.Diagnostics/Views/CompilationErrorPage.cs
new file mode 100644
index 0000000000..c2647b0698
--- /dev/null
+++ b/src/Microsoft.AspNet.Diagnostics/Views/CompilationErrorPage.cs
@@ -0,0 +1,417 @@
+namespace Microsoft.AspNet.Diagnostics.Views
+{
+#line 1 "CompilationErrorPage.cshtml"
+using System
+
+#line default
+#line hidden
+    ;
+#line 2 "CompilationErrorPage.cshtml"
+using System.Globalization
+
+#line default
+#line hidden
+    ;
+#line 3 "CompilationErrorPage.cshtml"
+using System.Linq
+
+#line default
+#line hidden
+    ;
+#line 4 "CompilationErrorPage.cshtml"
+using System.Net
+
+#line default
+#line hidden
+    ;
+#line 5 "CompilationErrorPage.cshtml"
+using Views
+
+#line default
+#line hidden
+    ;
+    using System.Threading.Tasks;
+
+    public class CompilationErrorPage : Microsoft.AspNet.Diagnostics.Views.BaseView
+    {
+#line 7 "CompilationErrorPage.cshtml"
+
+    public CompilationErrorPageModel Model { get; set; }
+
+#line default
+#line hidden
+        #line hidden
+        public CompilationErrorPage()
+        {
+        }
+
+        #pragma warning disable 1998
+        public override async Task ExecuteAsync()
+        {
+#line 10 "CompilationErrorPage.cshtml"
+  
+    var errorDetail = Model.ErrorDetails;
+
+    Response.StatusCode = 500;
+    Response.ContentType = "text/html";
+    Response.ContentLength = null; // Clear any prior Content-Length
+
+#line default
+#line hidden
+
+            WriteLiteral("\r\n<!DOCTYPE html>\r\n<html>\r\n    <head>\r\n        <meta charset=\"utf-8\" />\r\n        " +
+"<title>");
+#line 21 "CompilationErrorPage.cshtml"
+          Write(Resources.ErrorPageHtml_Title);
+
+#line default
+#line hidden
+            WriteLiteral("</title>\r\n        <style>\r\n            body {\r\n    font-family: 'Segoe UI', Tahoma, Arial, Helvetica, sans-serif;\r\n    font-size: .813em;\r\n    line-height: 1.4em;\r\n    color: #222;\r\n}\r\n\r\nh1, h2, h3, h4, h5 {\r\n    /*font-family: 'Segoe UI',Tahoma,Arial,Helvetica,sans-serif;*/\r\n    font-weight: 100;\r\n}\r\n\r\nh1 {\r\n    color: #44525e;\r\n    margin: 15px 0 15px 0;\r\n}\r\n\r\nh2 {\r\n    margin: 10px 5px 0 0;\r\n}\r\n\r\nh3 {\r\n    color: #363636;\r\n    margin: 5px 5px 0 0;\r\n}\r\n\r\ncode {\r\n    font-family: Consolas, \"Courier New\", courier, monospace;\r\n}\r\n\r\nbody .titleerror {\r\n    padding: 3px;\r\n    display: block;\r\n    font-size: 1.5em;\r\n    font-weight: 100;\r\n}\r\n\r\nbody .location {\r\n    margin: 3px 0 10px 30px;\r\n}\r\n\r\n#header {\r\n    font-size: 18px;\r\n    padding: 15px 0;\r\n    border-top: 1px #ddd solid;\r\n    border-bottom: 1px #ddd solid;\r\n    margin-bottom: 0;\r\n}\r\n\r\n    #header li {\r\n        display: inline;\r\n        margin: 5px;\r\n        padding: 5px;\r\n        color: #a0a0a0;\r\n        cursor: pointer;\r\n    }\r\n\r\n        #header li:hover {\r\n            background: #a9e4f9;\r\n            color: #fff;\r\n        }\r\n\r\n        #header .selected {\r\n            background: #44c5f2;\r\n            color: #fff;\r\n        }\r\n\r\n#stackpage ul {\r\n    list-style: none;\r\n    padding-left: 0;\r\n    margin: 0;\r\n    /*border-bottom: 1px #ddd solid;*/\r\n}\r\n\r\n#stackpage .stackerror {\r\n    padding: 5px;\r\n    border-bottom: 1px #ddd solid;\r\n}\r\n\r\n    #stackpage .stackerror:hover {\r\n        background-color: #f0f0f0;\r\n    }\r\n\r\n#stackpage .frame:hover {\r\n    background-color: #f0f0f0;\r\n    text-decoration: none;\r\n}\r\n\r\n#stackpage .frame {\r\n    padding: 2px;\r\n    margin: 0 0 0 30px;\r\n    border-bottom: 1px #ddd solid;\r\n    cursor: pointer;\r\n}\r\n\r\n    #stackpage .frame h3 {\r\n        padding: 5px;\r\n        margin: 0;\r\n    }\r\n\r\n#stackpage .source {\r\n    padding: 0;\r\n}\r\n\r\n    #stackpage .source ol li {\r\n        font-family: Consolas, \"Courier New\", courier, monospace;\r\n        white-space: pre;\r\n    }\r\n\r\n#stackpage .frame:hover .source .highlight li span {\r\n    color: #fff;\r\n    background: #b20000;\r\n}\r\n\r\n#stackpage .source ol.collapsable li {\r\n    color: #888;\r\n}\r\n\r\n    #stackpage .source ol.collapsable li span {\r\n        color: #606060;\r\n    }\r\n\r\n.page table {\r\n    border-collapse: separate;\r\n    border-spacing: 0;\r\n    margin: 0 0 20px;\r\n}\r\n\r\n.page th {\r\n    vertical-align: bottom;\r\n    padding: 10px 5px 5px 5px;\r\n    font-weight: 400;\r\n    color: #a0a0a0;\r\n    text-align: left;\r\n}\r\n\r\n.page td {\r\n    padding: 3px 10px;\r\n}\r\n\r\n.page th, .page td {\r\n    border-right: 1px #ddd solid;\r\n    border-bottom: 1px #ddd solid;\r\n    border-left: 1px transparent solid;\r\n    border-top: 1px transparent solid;\r\n    box-sizing: border-box;\r\n}\r\n\r\n    .page th:last-child, .page td:last-child {\r\n        border-right: 1px transparent solid;\r\n    }\r\n\r\n    .page .length {\r\n        text-align: right;\r\n    }\r\n\r\na {\r\n    color: #1ba1e2;\r\n    text-decoration: none;\r\n}\r\n\r\n    a:hover {\r\n        color: #13709e;\r\n        text-decoration: underline;\r\n    }\r\n\r\n        </s" +
+"tyle>\r\n    </head>\r\n    <body>\r\n        <h1>");
+#line 27 "CompilationErrorPage.cshtml"
+       Write(Resources.ErrorPageHtml_CompilationException);
+
+#line default
+#line hidden
+            WriteLiteral("</h1>\r\n");
+#line 28 "CompilationErrorPage.cshtml"
+        
+
+#line default
+#line hidden
+
+#line 28 "CompilationErrorPage.cshtml"
+         if (Model.Options.ShowExceptionDetails)
+        {
+
+#line default
+#line hidden
+
+            WriteLiteral("            <div class=\"titleerror\">");
+#line 30 "CompilationErrorPage.cshtml"
+                               Write(errorDetail.Error.GetType().Name);
+
+#line default
+#line hidden
+            WriteLiteral(": ");
+#line 30 "CompilationErrorPage.cshtml"
+                                                                          Output.Write(WebUtility.HtmlEncode(errorDetail.Error.Message).Replace("\r\n", "<br/>").Replace("\r", "<br/>").Replace("\n", "<br/>")); 
+
+#line default
+#line hidden
+
+            WriteLiteral("</div>\r\n");
+#line 31 "CompilationErrorPage.cshtml"
+        }
+        else
+        {
+
+#line default
+#line hidden
+
+            WriteLiteral("            <h2>");
+#line 34 "CompilationErrorPage.cshtml"
+           Write(Resources.ErrorPageHtml_EnableShowExceptions);
+
+#line default
+#line hidden
+            WriteLiteral("</h2>\r\n");
+#line 35 "CompilationErrorPage.cshtml"
+        }
+
+#line default
+#line hidden
+
+            WriteLiteral("        ");
+#line 36 "CompilationErrorPage.cshtml"
+         if (Model.Options.ShowExceptionDetails)
+        {
+
+#line default
+#line hidden
+
+            WriteLiteral("            <div id=\"stackpage\" class=\"page\">\r\n");
+#line 39 "CompilationErrorPage.cshtml"
+                
+
+#line default
+#line hidden
+
+#line 39 "CompilationErrorPage.cshtml"
+                   int tabIndex = 6; 
+
+#line default
+#line hidden
+
+            WriteLiteral("\r\n                <br />\r\n                <ul>\r\n");
+#line 42 "CompilationErrorPage.cshtml"
+                
+
+#line default
+#line hidden
+
+#line 42 "CompilationErrorPage.cshtml"
+                 foreach (var frame in errorDetail.StackFrames)
+                {
+
+#line default
+#line hidden
+
+            WriteLiteral("                    <li class=\"frame\"");
+            WriteAttribute("tabindex", Tuple.Create(" tabindex=\"", 1370), Tuple.Create("\"", 1390), 
+            Tuple.Create(Tuple.Create("", 1381), Tuple.Create<System.Object, System.Int32>(tabIndex, 1381), false));
+            WriteLiteral(">\r\n");
+#line 45 "CompilationErrorPage.cshtml"
+                        
+
+#line default
+#line hidden
+
+#line 45 "CompilationErrorPage.cshtml"
+                           tabIndex++; 
+
+#line default
+#line hidden
+
+            WriteLiteral("\r\n");
+#line 46 "CompilationErrorPage.cshtml"
+                        
+
+#line default
+#line hidden
+
+#line 46 "CompilationErrorPage.cshtml"
+                         if (!string.IsNullOrEmpty(frame.ErrorDetails))
+                        {
+
+#line default
+#line hidden
+
+            WriteLiteral("                            <h3>");
+#line 48 "CompilationErrorPage.cshtml"
+                           Write(frame.ErrorDetails);
+
+#line default
+#line hidden
+            WriteLiteral("</h3>\r\n");
+#line 49 "CompilationErrorPage.cshtml"
+                        }
+                        else
+                        {
+                            if (string.IsNullOrEmpty(frame.File))
+                            {
+
+#line default
+#line hidden
+
+            WriteLiteral("                                <h3>");
+#line 54 "CompilationErrorPage.cshtml"
+                               Write(frame.Function);
+
+#line default
+#line hidden
+            WriteLiteral("</h3>\r\n");
+#line 55 "CompilationErrorPage.cshtml"
+                            }
+                            else
+                            {
+
+#line default
+#line hidden
+
+            WriteLiteral("                                <h3>");
+#line 58 "CompilationErrorPage.cshtml"
+                               Write(frame.Function);
+
+#line default
+#line hidden
+            WriteLiteral(" in <code");
+            WriteAttribute("title", Tuple.Create(" title=\"", 1990), Tuple.Create("\"", 2009), 
+            Tuple.Create(Tuple.Create("", 1998), Tuple.Create<System.Object, System.Int32>(frame.File, 1998), false));
+            WriteLiteral(">");
+#line 58 "CompilationErrorPage.cshtml"
+                                                                            Write(System.IO.Path.GetFileName(frame.File));
+
+#line default
+#line hidden
+            WriteLiteral("</code></h3>\r\n");
+#line 59 "CompilationErrorPage.cshtml"
+                            }
+                        }
+
+#line default
+#line hidden
+
+            WriteLiteral("                                    \r\n");
+#line 62 "CompilationErrorPage.cshtml"
+                        
+
+#line default
+#line hidden
+
+#line 62 "CompilationErrorPage.cshtml"
+                         if (frame.Line != 0 && frame.ContextCode.Any())
+                        {
+
+#line default
+#line hidden
+
+            WriteLiteral("                            <div class=\"source\">\r\n");
+#line 65 "CompilationErrorPage.cshtml"
+                                
+
+#line default
+#line hidden
+
+#line 65 "CompilationErrorPage.cshtml"
+                                 if (frame.PreContextCode != null)
+                                {
+
+#line default
+#line hidden
+
+            WriteLiteral("                                    <ol");
+            WriteAttribute("start", Tuple.Create(" start=\"", 2453), Tuple.Create("\"", 2482), 
+            Tuple.Create(Tuple.Create("", 2461), Tuple.Create<System.Object, System.Int32>(frame.PreContextLine, 2461), false));
+            WriteLiteral(" class=\"collapsible\">\r\n");
+#line 68 "CompilationErrorPage.cshtml"
+                                        
+
+#line default
+#line hidden
+
+#line 68 "CompilationErrorPage.cshtml"
+                                         foreach (var line in frame.PreContextCode)
+                                        {
+
+#line default
+#line hidden
+
+            WriteLiteral("                                            <li><span>");
+#line 70 "CompilationErrorPage.cshtml"
+                                                 Write(line);
+
+#line default
+#line hidden
+            WriteLiteral("</span></li>\r\n");
+#line 71 "CompilationErrorPage.cshtml"
+                                        }
+
+#line default
+#line hidden
+
+            WriteLiteral("                                    </ol>\r\n");
+#line 73 "CompilationErrorPage.cshtml"
+                                } 
+
+#line default
+#line hidden
+
+            WriteLiteral("\r\n                                <ol");
+            WriteAttribute("start", Tuple.Create(" start=\"", 2866), Tuple.Create("\"", 2885), 
+            Tuple.Create(Tuple.Create("", 2874), Tuple.Create<System.Object, System.Int32>(frame.Line, 2874), false));
+            WriteLiteral(" class=\"highlight\">\r\n");
+#line 76 "CompilationErrorPage.cshtml"
+                                    
+
+#line default
+#line hidden
+
+#line 76 "CompilationErrorPage.cshtml"
+                                     foreach (var line in frame.ContextCode)
+                                    {
+
+#line default
+#line hidden
+
+            WriteLiteral("                                        <li><span>");
+#line 78 "CompilationErrorPage.cshtml"
+                                             Write(line);
+
+#line default
+#line hidden
+            WriteLiteral("</span></li>\r\n");
+#line 79 "CompilationErrorPage.cshtml"
+                                    }
+
+#line default
+#line hidden
+
+            WriteLiteral("                                </ol>                                    \r\n\r\n");
+#line 82 "CompilationErrorPage.cshtml"
+                                
+
+#line default
+#line hidden
+
+#line 82 "CompilationErrorPage.cshtml"
+                                 if (frame.PostContextCode != null)
+                                {
+
+#line default
+#line hidden
+
+            WriteLiteral("                                    <ol");
+            WriteAttribute("start", Tuple.Create(" start=\'", 3352), Tuple.Create("\'", 3377), 
+            Tuple.Create(Tuple.Create("", 3360), Tuple.Create<System.Object, System.Int32>(frame.Line + 1, 3360), false));
+            WriteLiteral(" class=\"collapsible\">\r\n");
+#line 85 "CompilationErrorPage.cshtml"
+                                        
+
+#line default
+#line hidden
+
+#line 85 "CompilationErrorPage.cshtml"
+                                         foreach (var line in frame.PostContextCode)
+                                        {
+
+#line default
+#line hidden
+
+            WriteLiteral("                                            <li><span>");
+#line 87 "CompilationErrorPage.cshtml"
+                                                 Write(line);
+
+#line default
+#line hidden
+            WriteLiteral("</span></li>\r\n");
+#line 88 "CompilationErrorPage.cshtml"
+                                        }
+
+#line default
+#line hidden
+
+            WriteLiteral("                                    </ol>\r\n");
+#line 90 "CompilationErrorPage.cshtml"
+                                } 
+
+#line default
+#line hidden
+
+            WriteLiteral("                            </div>\r\n");
+#line 92 "CompilationErrorPage.cshtml"
+                        } 
+
+#line default
+#line hidden
+
+            WriteLiteral("                    </li>\r\n");
+#line 94 "CompilationErrorPage.cshtml"
+                }
+
+#line default
+#line hidden
+
+            WriteLiteral("                </ul>\r\n            </div>\r\n");
+#line 97 "CompilationErrorPage.cshtml"
+        }
+
+#line default
+#line hidden
+
+            WriteLiteral("        <script>\r\n            //<!--\r\n            (function (window, undefined) {\r\n    \"use strict\";\r\n\r\n    function $(selector, element) {\r\n        return new NodeCollection(selector, element);\r\n    }\r\n\r\n    function NodeCollection(selector, element) {\r\n        this.items = [];\r\n        element = element || window.document;\r\n\r\n        var nodeList;\r\n\r\n        if (typeof (selector) === \"string\") {\r\n            nodeList = element.querySelectorAll(selector);\r\n            for (var i = 0, l = nodeList.length; i < l; i++) {\r\n                this.items.push(nodeList.item(i));\r\n            }\r\n        } else if (selector.tagName) {\r\n            this.items.push(selector);\r\n        } else if (selector.splice) {\r\n            this.items = this.items.concat(selector);\r\n        }\r\n    }\r\n\r\n    NodeCollection.prototype = {\r\n        each: function (callback) {\r\n            for (var i = 0, l = this.items.length; i < l; i++) {\r\n                callback(this.items[i], i);\r\n            }\r\n            return this;\r\n        },\r\n\r\n        children: function (selector) {\r\n            var children = [];\r\n\r\n            this.each(function (el) {\r\n                children = children.concat($(selector, el).items);\r\n            });\r\n\r\n            return $(children);\r\n        },\r\n\r\n        hide: function () {\r\n            this.each(function (el) {\r\n                el.style.display = \"none\";\r\n            });\r\n\r\n            return this;\r\n        },\r\n\r\n        toggle: function () {\r\n            this.each(function (el) {\r\n                el.style.display = el.style.display === \"none\" ? \"\" : \"none\";\r\n            });\r\n\r\n            return this;\r\n        },\r\n\r\n        show: function () {\r\n            this.each(function (el) {\r\n                el.style.display = \"\";\r\n            });\r\n\r\n            return this;\r\n        },\r\n\r\n        addClass: function (className) {\r\n            this.each(function (el) {\r\n                var existingClassName = el.className,\r\n                    classNames;\r\n                if (!existingClassName) {\r\n                    el.className = className;\r\n                } else {\r\n                    classNames = existingClassName.split(\" \");\r\n                    if (classNames.indexOf(className) < 0) {\r\n                        el.className = existingClassName + \" \" + className;\r\n                    }\r\n                }\r\n            });\r\n\r\n            return this;\r\n        },\r\n\r\n        removeClass: function (className) {\r\n            this.each(function (el) {\r\n                var existingClassName = el.className,\r\n                    classNames, index;\r\n                if (existingClassName === className) {\r\n                    el.className = \"\";\r\n                } else if (existingClassName) {\r\n                    classNames = existingClassName.split(\" \");\r\n                    index = classNames.indexOf(className);\r\n                    if (index > 0) {\r\n                        classNames.splice(index, 1);\r\n                        el.className = classNames.join(\" \");\r\n                    }\r\n                }\r\n            });\r\n\r\n            return this;\r\n        },\r\n\r\n        toggleClass: function (className) {\r\n            this.each(function (el) {\r\n                var classNames = el.className.split(\" \");\r\n                if (classNames.indexOf(className) >= 0) {\r\n                    $(el).removeClass(className);\r\n                } else {\r\n                    $(el).addClass(className);\r\n                }\r\n            });\r\n\r\n            return this;\r\n        },\r\n\r\n        attr: function (name) {\r\n            if (this.items.length === 0) {\r\n                return null;\r\n            }\r\n\r\n            return this.items[0].getAttribute(name);\r\n        },\r\n\r\n        on: function (eventName, handler) {\r\n            this.each(function (el, idx) {\r\n                var callback = function (e) {\r\n                    e = e || window.event;\r\n                    if (!e.which && e.keyCode) {\r\n                        e.which = e.keyCode; // Normalize IE8 key events\r\n                    }\r\n                    handler.apply(el, [e]);\r\n                };\r\n\r\n                if (el.addEventListener) { // DOM Events\r\n                    el.addEventListener(eventName, callback, false);\r\n                } else if (el.attachEvent) { // IE8 events\r\n                    el.attachEvent(\"on\" + eventName, callback);\r\n                } else {\r\n                    el[\"on\" + type] = callback;\r\n                }\r\n            });\r\n\r\n            return this;\r\n        },\r\n\r\n        click: function (handler) {\r\n            return this.on(\"click\", handler);\r\n        },\r\n\r\n        keypress: function (handler) {\r\n            return this.on(\"keypress\", handler);\r\n        }\r\n    };\r\n\r\n    function frame(el) {\r\n        $(el).children(\".source .collapsible\").toggle();\r\n    }\r\n\r\n    function tab(el) {\r\n        var unselected = $(\"#header .selected\").removeClass(\"selected\").attr(\"id\");\r\n        var selected = $(el).addClass(\"selected\").attr(\"id\");\r\n\r\n        $(\"#\" + unselected + \"page\").hide();\r\n        $(\"#\" + selected + \"page\").show();\r\n    }\r\n\r\n    $(\".collapsible\").hide();\r\n    $(\".page\").hide();\r\n    $(\"#stackpage\").show();\r\n\r\n    $(\".frame\")\r\n        .click(function () {\r\n            frame(this);\r\n        })\r\n        .keypress(function (e) {\r\n            if (e.which === 13) {\r\n                frame(this);\r\n            }\r\n        });\r\n\r\n    $(\"#header li\")\r\n        .click(function () {\r\n            tab(this);\r\n        })\r\n        .keypress(function (e) {\r\n            if (e.which === 13) {\r\n                tab(this);\r\n            }\r\n        });\r\n})(window);\r\n " +
+"           //-->\r\n        </script>\r\n    </body>\r\n</html>\r\n");
+        }
+        #pragma warning restore 1998
+    }
+}
diff --git a/src/Microsoft.AspNet.Diagnostics/Views/CompilationErrorPage.cshtml b/src/Microsoft.AspNet.Diagnostics/Views/CompilationErrorPage.cshtml
new file mode 100644
index 0000000000..be1af37dac
--- /dev/null
+++ b/src/Microsoft.AspNet.Diagnostics/Views/CompilationErrorPage.cshtml
@@ -0,0 +1,101 @@
+@using System
+@using System.Globalization
+@using System.Linq
+@using System.Net
+@using Views
+@functions
+{
+    public CompilationErrorPageModel Model { get; set; }
+}
+@{
+    var errorDetail = Model.ErrorDetails;
+
+    Response.StatusCode = 500;
+    Response.ContentType = "text/html";
+    Response.ContentLength = null; // Clear any prior Content-Length
+}
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8" />
+        <title>@Resources.ErrorPageHtml_Title</title>
+        <style>
+            <%$ include: ErrorPage.css %>
+        </style>
+    </head>
+    <body>
+        <h1>@Resources.ErrorPageHtml_CompilationException</h1>
+        @if (Model.Options.ShowExceptionDetails)
+        {
+            <div class="titleerror">@errorDetail.Error.GetType().Name: @{ Output.Write(WebUtility.HtmlEncode(errorDetail.Error.Message).Replace("\r\n", "<br/>").Replace("\r", "<br/>").Replace("\n", "<br/>")); }</div>
+        }
+        else
+        {
+            <h2>@Resources.ErrorPageHtml_EnableShowExceptions</h2>
+        }
+        @if (Model.Options.ShowExceptionDetails)
+        {
+            <div id="stackpage" class="page">
+                @{ int tabIndex = 6; }
+                <br />
+                <ul>
+                @foreach (var frame in errorDetail.StackFrames)
+                {
+                    <li class="frame" tabindex="@tabIndex">
+                        @{ tabIndex++; }
+                        @if (!string.IsNullOrEmpty(frame.ErrorDetails))
+                        {
+                            <h3>@frame.ErrorDetails</h3>
+                        }
+                        else
+                        {
+                            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())
+                        {
+                            <div class="source">
+                                @if (frame.PreContextCode != null)
+                                {
+                                    <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)
+                                    {
+                                        <li><span>@line</span></li>
+                                    }
+                                </ol>
+                                @if (frame.PostContextCode != null)
+                                {
+                                    <ol start='@(frame.Line + 1)' class="collapsible">
+                                        @foreach (var line in frame.PostContextCode)
+                                        {
+                                            <li><span>@line</span></li>
+                                        }
+                                    </ol>
+                                } 
+                            </div>
+                        } 
+                    </li>
+                }
+                </ul>
+            </div>
+        }
+        <script>
+            //<!--
+            <%$ include: ErrorPage.js %>
+            //-->
+        </script>
+    </body>
+</html>
diff --git a/src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cs b/src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cs
index a2826d6d32..ecb486deae 100644
--- a/src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cs
+++ b/src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cs
@@ -472,7 +472,7 @@ using Views
 #line hidden
 
 #line 123 "ErrorPage.cshtml"
-                                     if (frame.Line != 0 && frame.ContextCode != null)
+                                     if (frame.Line != 0 && frame.ContextCode.Any())
                                     {
 
 #line default
@@ -493,8 +493,8 @@ using Views
 #line hidden
 
             WriteLiteral("                                                <ol");
-            WriteAttribute("start", Tuple.Create(" start=\"", 5277), Tuple.Create("\"", 5306), 
-            Tuple.Create(Tuple.Create("", 5285), Tuple.Create<System.Object, System.Int32>(frame.PreContextLine, 5285), false));
+            WriteAttribute("start", Tuple.Create(" start=\"", 5275), Tuple.Create("\"", 5304), 
+            Tuple.Create(Tuple.Create("", 5283), Tuple.Create<System.Object, System.Int32>(frame.PreContextLine, 5283), false));
             WriteLiteral(" class=\"collapsible\">\r\n");
 #line 129 "ErrorPage.cshtml"
                                                     
@@ -530,22 +530,43 @@ using Views
 #line hidden
 
             WriteLiteral("\r\n                                            <ol");
-            WriteAttribute("start", Tuple.Create(" start=\"", 5774), Tuple.Create("\"", 5793), 
-            Tuple.Create(Tuple.Create("", 5782), Tuple.Create<System.Object, System.Int32>(frame.Line, 5782), false));
-            WriteLiteral(" class=\"highlight\">\r\n                                                <li><span>");
+            WriteAttribute("start", Tuple.Create(" start=\"", 5772), Tuple.Create("\"", 5791), 
+            Tuple.Create(Tuple.Create("", 5780), Tuple.Create<System.Object, System.Int32>(frame.Line, 5780), false));
+            WriteLiteral(" class=\"highlight\">\r\n");
 #line 137 "ErrorPage.cshtml"
-                                                     Write(frame.ContextCode);
+                                                
 
 #line default
 #line hidden
-            WriteLiteral("</span></li></ol>\r\n\r\n");
+
+#line 137 "ErrorPage.cshtml"
+                                                 foreach (var line in frame.ContextCode)
+                                                {
+
+#line default
+#line hidden
+
+            WriteLiteral("                                                    <li><span>");
 #line 139 "ErrorPage.cshtml"
+                                                         Write(line);
+
+#line default
+#line hidden
+            WriteLiteral("</span></li>\r\n");
+#line 140 "ErrorPage.cshtml"
+                                                }
+
+#line default
+#line hidden
+
+            WriteLiteral("                                            </ol>\r\n\r\n");
+#line 143 "ErrorPage.cshtml"
                                             
 
 #line default
 #line hidden
 
-#line 139 "ErrorPage.cshtml"
+#line 143 "ErrorPage.cshtml"
                                              if (frame.PostContextCode != null)
                                             {
 
@@ -553,16 +574,16 @@ using Views
 #line hidden
 
             WriteLiteral("                                                <ol");
-            WriteAttribute("start", Tuple.Create(" start=\'", 6091), Tuple.Create("\'", 6116), 
-            Tuple.Create(Tuple.Create("", 6099), Tuple.Create<System.Object, System.Int32>(frame.Line + 1, 6099), false));
+            WriteAttribute("start", Tuple.Create(" start=\'", 6318), Tuple.Create("\'", 6343), 
+            Tuple.Create(Tuple.Create("", 6326), Tuple.Create<System.Object, System.Int32>(frame.Line + 1, 6326), false));
             WriteLiteral(" class=\"collapsible\">\r\n");
-#line 142 "ErrorPage.cshtml"
+#line 146 "ErrorPage.cshtml"
                                                     
 
 #line default
 #line hidden
 
-#line 142 "ErrorPage.cshtml"
+#line 146 "ErrorPage.cshtml"
                                                      foreach (var line in frame.PostContextCode)
                                                     {
 
@@ -570,55 +591,55 @@ using Views
 #line hidden
 
             WriteLiteral("                                                        <li><span>");
-#line 144 "ErrorPage.cshtml"
+#line 148 "ErrorPage.cshtml"
                                                              Write(line);
 
 #line default
 #line hidden
             WriteLiteral("</span></li>\r\n");
-#line 145 "ErrorPage.cshtml"
+#line 149 "ErrorPage.cshtml"
                                                     }
 
 #line default
 #line hidden
 
             WriteLiteral("                                                </ol>\r\n");
-#line 147 "ErrorPage.cshtml"
+#line 151 "ErrorPage.cshtml"
                                             } 
 
 #line default
 #line hidden
 
             WriteLiteral("                                        </div>\r\n");
-#line 149 "ErrorPage.cshtml"
+#line 153 "ErrorPage.cshtml"
                                     } 
 
 #line default
 #line hidden
 
             WriteLiteral("                                </li>\r\n");
-#line 151 "ErrorPage.cshtml"
+#line 155 "ErrorPage.cshtml"
                             }
 
 #line default
 #line hidden
 
             WriteLiteral("                            </ul>\r\n                        </li>\r\n");
-#line 154 "ErrorPage.cshtml"
+#line 158 "ErrorPage.cshtml"
                     }
 
 #line default
 #line hidden
 
             WriteLiteral("                </ul>\r\n            </div>\r\n");
-#line 157 "ErrorPage.cshtml"
+#line 161 "ErrorPage.cshtml"
         }
 
 #line default
 #line hidden
 
             WriteLiteral("        ");
-#line 158 "ErrorPage.cshtml"
+#line 162 "ErrorPage.cshtml"
          if (Model.Options.ShowQuery)
         {
 
@@ -626,13 +647,13 @@ using Views
 #line hidden
 
             WriteLiteral("            <div id=\"querypage\" class=\"page\">\r\n");
-#line 161 "ErrorPage.cshtml"
+#line 165 "ErrorPage.cshtml"
                 
 
 #line default
 #line hidden
 
-#line 161 "ErrorPage.cshtml"
+#line 165 "ErrorPage.cshtml"
                  if (Model.Query.Any())
                 {
 
@@ -641,26 +662,26 @@ using Views
 
             WriteLiteral("                    <table>\r\n                        <thead>\r\n                   " +
 "         <tr>\r\n                                <th>");
-#line 166 "ErrorPage.cshtml"
+#line 170 "ErrorPage.cshtml"
                                Write(Resources.ErrorPageHtml_VariableColumn);
 
 #line default
 #line hidden
             WriteLiteral("</th>\r\n                                <th>");
-#line 167 "ErrorPage.cshtml"
+#line 171 "ErrorPage.cshtml"
                                Write(Resources.ErrorPageHtml_ValueColumn);
 
 #line default
 #line hidden
             WriteLiteral("</th>\r\n                            </tr>\r\n                        </thead>\r\n     " +
 "                   <tbody>\r\n");
-#line 171 "ErrorPage.cshtml"
+#line 175 "ErrorPage.cshtml"
                             
 
 #line default
 #line hidden
 
-#line 171 "ErrorPage.cshtml"
+#line 175 "ErrorPage.cshtml"
                              foreach (var kv in Model.Query.OrderBy(kv => kv.Key))
                             {
                                 foreach (var v in kv.Value)
@@ -671,19 +692,19 @@ using Views
 
             WriteLiteral("                                    <tr>\r\n                                       " +
 " <td>");
-#line 176 "ErrorPage.cshtml"
+#line 180 "ErrorPage.cshtml"
                                        Write(kv.Key);
 
 #line default
 #line hidden
             WriteLiteral("</td>\r\n                                        <td>");
-#line 177 "ErrorPage.cshtml"
+#line 181 "ErrorPage.cshtml"
                                        Write(v);
 
 #line default
 #line hidden
             WriteLiteral("</td>\r\n                                    </tr>\r\n");
-#line 179 "ErrorPage.cshtml"
+#line 183 "ErrorPage.cshtml"
                                 }
                             }
 
@@ -691,7 +712,7 @@ using Views
 #line hidden
 
             WriteLiteral("                        </tbody>\r\n                    </table>\r\n");
-#line 183 "ErrorPage.cshtml"
+#line 187 "ErrorPage.cshtml"
                 }
                 else
                 {
@@ -700,27 +721,27 @@ using Views
 #line hidden
 
             WriteLiteral("                    <p>");
-#line 186 "ErrorPage.cshtml"
+#line 190 "ErrorPage.cshtml"
                   Write(Resources.ErrorPageHtml_NoQueryStringData);
 
 #line default
 #line hidden
             WriteLiteral("</p>\r\n");
-#line 187 "ErrorPage.cshtml"
+#line 191 "ErrorPage.cshtml"
                 }
 
 #line default
 #line hidden
 
             WriteLiteral("            </div>\r\n");
-#line 189 "ErrorPage.cshtml"
+#line 193 "ErrorPage.cshtml"
         }
 
 #line default
 #line hidden
 
             WriteLiteral("        ");
-#line 190 "ErrorPage.cshtml"
+#line 194 "ErrorPage.cshtml"
          if (Model.Options.ShowCookies)
         {
             /* TODO:
@@ -757,7 +778,7 @@ using Views
 #line hidden
 
             WriteLiteral("        ");
-#line 221 "ErrorPage.cshtml"
+#line 225 "ErrorPage.cshtml"
          if (Model.Options.ShowHeaders)
         {
 
@@ -765,13 +786,13 @@ using Views
 #line hidden
 
             WriteLiteral("            <div id=\"headerspage\" class=\"page\">\r\n");
-#line 224 "ErrorPage.cshtml"
+#line 228 "ErrorPage.cshtml"
                 
 
 #line default
 #line hidden
 
-#line 224 "ErrorPage.cshtml"
+#line 228 "ErrorPage.cshtml"
                  if (Model.Headers.Any())
                 {
 
@@ -780,26 +801,26 @@ using Views
 
             WriteLiteral("                    <table>\r\n                        <thead>\r\n                   " +
 "         <tr>\r\n                                <th>");
-#line 229 "ErrorPage.cshtml"
+#line 233 "ErrorPage.cshtml"
                                Write(Resources.ErrorPageHtml_VariableColumn);
 
 #line default
 #line hidden
             WriteLiteral("</th>\r\n                                <th>");
-#line 230 "ErrorPage.cshtml"
+#line 234 "ErrorPage.cshtml"
                                Write(Resources.ErrorPageHtml_ValueColumn);
 
 #line default
 #line hidden
             WriteLiteral("</th>\r\n                            </tr>\r\n                        </thead>\r\n     " +
 "                   <tbody>\r\n");
-#line 234 "ErrorPage.cshtml"
+#line 238 "ErrorPage.cshtml"
                             
 
 #line default
 #line hidden
 
-#line 234 "ErrorPage.cshtml"
+#line 238 "ErrorPage.cshtml"
                              foreach (var kv in Model.Headers.OrderBy(kv => kv.Key))
                             {
                                 foreach (var v in kv.Value)
@@ -810,19 +831,19 @@ using Views
 
             WriteLiteral("                                    <tr>\r\n                                       " +
 " <td>");
-#line 239 "ErrorPage.cshtml"
+#line 243 "ErrorPage.cshtml"
                                        Write(kv.Key);
 
 #line default
 #line hidden
             WriteLiteral("</td>\r\n                                        <td>");
-#line 240 "ErrorPage.cshtml"
+#line 244 "ErrorPage.cshtml"
                                        Write(v);
 
 #line default
 #line hidden
             WriteLiteral("</td>\r\n                                    </tr>\r\n");
-#line 242 "ErrorPage.cshtml"
+#line 246 "ErrorPage.cshtml"
                                 }
                             }
 
@@ -830,7 +851,7 @@ using Views
 #line hidden
 
             WriteLiteral("                        </tbody>\r\n                    </table>\r\n");
-#line 246 "ErrorPage.cshtml"
+#line 250 "ErrorPage.cshtml"
                 }
                 else
                 {
@@ -839,27 +860,27 @@ using Views
 #line hidden
 
             WriteLiteral("                    <p>");
-#line 249 "ErrorPage.cshtml"
+#line 253 "ErrorPage.cshtml"
                   Write(Resources.ErrorPageHtml_NoHeaderData);
 
 #line default
 #line hidden
             WriteLiteral("</p>\r\n");
-#line 250 "ErrorPage.cshtml"
+#line 254 "ErrorPage.cshtml"
                 }
 
 #line default
 #line hidden
 
             WriteLiteral("            </div>\r\n");
-#line 252 "ErrorPage.cshtml"
+#line 256 "ErrorPage.cshtml"
         }
 
 #line default
 #line hidden
 
             WriteLiteral("        ");
-#line 253 "ErrorPage.cshtml"
+#line 257 "ErrorPage.cshtml"
          if (Model.Options.ShowEnvironment)
         {
             /* TODO:
diff --git a/src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cshtml b/src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cshtml
index de7abfad3c..7a0075ac42 100644
--- a/src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cshtml
+++ b/src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cshtml
@@ -120,7 +120,7 @@
                                         <h3>@frame.Function in <code title="@frame.File">@System.IO.Path.GetFileName(frame.File)</code></h3>
                                     }
 
-                                    @if (frame.Line != 0 && frame.ContextCode != null)
+                                    @if (frame.Line != 0 && frame.ContextCode.Any())
                                     {
                                         <div class="source">
                                             @if (frame.PreContextCode != null)
@@ -134,7 +134,11 @@
                                             } 
 
                                             <ol start="@frame.Line" class="highlight">
-                                                <li><span>@frame.ContextCode</span></li></ol>
+                                                @foreach (var line in frame.ContextCode)
+                                                {
+                                                    <li><span>@line</span></li>
+                                                }
+                                            </ol>
 
                                             @if (frame.PostContextCode != null)
                                             {
diff --git a/src/Microsoft.AspNet.Diagnostics/Views/StackFrame.cs b/src/Microsoft.AspNet.Diagnostics/Views/StackFrame.cs
index 2b17068868..4a1ec2f513 100644
--- a/src/Microsoft.AspNet.Diagnostics/Views/StackFrame.cs
+++ b/src/Microsoft.AspNet.Diagnostics/Views/StackFrame.cs
@@ -39,11 +39,16 @@ namespace Microsoft.AspNet.Diagnostics.Views
         /// <summary>
         /// 
         /// </summary>
-        public string ContextCode { get; set; }
+        public IEnumerable<string> ContextCode { get; set; }
 
         /// <summary>
         /// 
         /// </summary>
         public IEnumerable<string> PostContextCode { get; set; }
+
+        /// <summary>
+        /// Specific error details for this stack frame.
+        /// </summary>
+        public string ErrorDetails { get; set; }
     }
 }