diff --git a/frappe/__init__.py b/frappe/__init__.py
index aeee9d8daf..b30909318c 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -557,7 +557,7 @@ def respond_as_web_page(title, html, success=None, http_status_code=None):
 	local.message = html
 	local.message_success = success
 	local.response['type'] = 'page'
-	local.response['page_name'] = 'message.html'
+	local.response['page_name'] = 'message'
 	if http_status_code:
 		local.response['http_status_code'] = http_status_code
 
diff --git a/frappe/app.py b/frappe/app.py
index 6e704894a6..c356741423 100644
--- a/frappe/app.py
+++ b/frappe/app.py
@@ -67,7 +67,10 @@ def application(request):
 		if frappe.local.is_ajax:
 			response = frappe.utils.response.report_error(getattr(e, "http_status_code", 500))
 		else:
-			response = frappe.website.render.render(getattr(e, "http_status_code", 500))
+			frappe.respond_as_web_page("Server Error",
+				"<pre>"+frappe.get_traceback()+"</pre>",
+				http_status_code=getattr(e, "http_status_code", 500))
+			response = frappe.website.render.render("message")
 
 		if e.__class__ == frappe.AuthenticationError:
 			if hasattr(frappe.local, "login_manager"):