diff --git a/src/Microsoft.AspNet.Diagnostics/Views/CompilationErrorPage.cs b/src/Microsoft.AspNet.Diagnostics/Views/CompilationErrorPage.cs
index 5d10cc856b..2bab1297cc 100644
--- a/src/Microsoft.AspNet.Diagnostics/Views/CompilationErrorPage.cs
+++ b/src/Microsoft.AspNet.Diagnostics/Views/CompilationErrorPage.cs
@@ -193,7 +193,7 @@ using Views
#line hidden
#line 48 "CompilationErrorPage.cshtml"
- if (frame.Line != 0 && frame.ContextCode.Any())
+ if (frame.Line != 0 && frame.ContextCode !=null && frame.ContextCode.Any())
{
#line default
diff --git a/src/Microsoft.AspNet.Diagnostics/Views/CompilationErrorPage.cshtml b/src/Microsoft.AspNet.Diagnostics/Views/CompilationErrorPage.cshtml
index 143ab573cf..22d2a539a3 100644
--- a/src/Microsoft.AspNet.Diagnostics/Views/CompilationErrorPage.cshtml
+++ b/src/Microsoft.AspNet.Diagnostics/Views/CompilationErrorPage.cshtml
@@ -45,7 +45,7 @@
@frame.ErrorDetails
}
- @if (frame.Line != 0 && frame.ContextCode.Any())
+ @if (frame.Line != 0 && frame.ContextCode !=null && frame.ContextCode.Any())
{
@if (frame.PreContextCode != null)
diff --git a/src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cs b/src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cs
index cf8002af99..080d3a431d 100644
--- a/src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cs
+++ b/src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cs
@@ -355,7 +355,7 @@ using Views
#line hidden
#line 97 "ErrorPage.cshtml"
- if (frame.Line != 0 && frame.ContextCode.Any())
+ if (frame.Line != 0 && frame.ContextCode !=null && frame.ContextCode.Any())
{
#line default
diff --git a/src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cshtml b/src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cshtml
index 03062a23e0..b6905bf89d 100644
--- a/src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cshtml
+++ b/src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cshtml
@@ -94,7 +94,7 @@
@frame.Function in @System.IO.Path.GetFileName(frame.File)
}
- @if (frame.Line != 0 && frame.ContextCode.Any())
+ @if (frame.Line != 0 && frame.ContextCode !=null && frame.ContextCode.Any())
{
@if (frame.PreContextCode != null)