diff --git a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs b/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs
index b635784bce..6372b1b846 100644
--- a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs
+++ b/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs
@@ -72,14 +72,8 @@ namespace Microsoft.AspNet.Diagnostics
 
                 try
                 {
+                    context.Response.Clear();
                     context.Response.StatusCode = 500;
-                    context.Response.Headers.Clear();
-
-                    // if buffering is enabled, then clear it as data could have been written into it.
-                    if (context.Response.Body.CanSeek)
-                    {
-                        context.Response.Body.SetLength(0);
-                    }
 
                     await DisplayException(context, ex);
                     return;
diff --git a/src/Microsoft.AspNet.Diagnostics/ExceptionHandler/ExceptionHandlerMiddleware.cs b/src/Microsoft.AspNet.Diagnostics/ExceptionHandler/ExceptionHandlerMiddleware.cs
index acb384a966..771f73b727 100644
--- a/src/Microsoft.AspNet.Diagnostics/ExceptionHandler/ExceptionHandlerMiddleware.cs
+++ b/src/Microsoft.AspNet.Diagnostics/ExceptionHandler/ExceptionHandlerMiddleware.cs
@@ -53,21 +53,15 @@ namespace Microsoft.AspNet.Diagnostics
                 }
                 try
                 {
+                    context.Response.Clear();
                     var exceptionHandlerFeature = new ExceptionHandlerFeature()
                     {
                         Error = ex,
                     };
                     context.Features.Set<IExceptionHandlerFeature>(exceptionHandlerFeature);
                     context.Response.StatusCode = 500;
-                    context.Response.Headers.Clear();
                     context.Response.OnStarting(_clearCacheHeadersDelegate, context.Response);
 
-                    // if buffering is enabled, then clear it as data could have been written into it.
-                    if (context.Response.Body.CanSeek)
-                    {
-                        context.Response.Body.SetLength(0);
-                    }
-
                     await _options.ExceptionHandler(context);
                     // TODO: Optional re-throw? We'll re-throw the original exception by default if the error handler throws.
                     return;