diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/ErrorPage.cshtml b/src/Orchard.Web/Themes/TheAdmin/Views/ErrorPage.cshtml
new file mode 100644
index 000000000..a6430b1f3
--- /dev/null
+++ b/src/Orchard.Web/Themes/TheAdmin/Views/ErrorPage.cshtml
@@ -0,0 +1,12 @@
+@*
+    ErrorPage(string Message, Exception Exception)
+*@
+
+<div>
+  <h1 id="page-title">@Html.TitleForPage(T("Oops. Something went wrong ... sorry"))</h1>
+  <div>
+      <p>@T("An unhandled exception has occurred and the request was terminated. Please refresh the page. If the error persists, go back").Text</p>
+      <p>@Model.Message</p>
+      <p>@Model.Exception</p>
+  </div>  
+</div>
diff --git a/src/Orchard.Web/Themes/Themes.csproj b/src/Orchard.Web/Themes/Themes.csproj
index a0517d7c1..2a9753c4e 100644
--- a/src/Orchard.Web/Themes/Themes.csproj
+++ b/src/Orchard.Web/Themes/Themes.csproj
@@ -151,6 +151,9 @@
     <Content Include="TheThemeMachine\Views\Pager.First.cshtml" />
     <Content Include="TheThemeMachine\Views\Pager.Last.cshtml" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="TheAdmin\Views\ErrorPage.cshtml" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.