diff --git a/frappe/website/page_controllers/error_page.py b/frappe/website/page_controllers/error_page.py
index caa72b015d..1f54a5f38c 100644
--- a/frappe/website/page_controllers/error_page.py
+++ b/frappe/website/page_controllers/error_page.py
@@ -1,5 +1,3 @@
-from frappe import _
-from frappe.website.page_controllers.not_found_page import NotFoundPage
 from frappe.website.page_controllers.template_page import TemplatePage
 
 class ErrorPage(TemplatePage):
diff --git a/frappe/website/page_controllers/not_found_page.py b/frappe/website/page_controllers/not_found_page.py
index d1a1797efc..1d15877e9d 100644
--- a/frappe/website/page_controllers/not_found_page.py
+++ b/frappe/website/page_controllers/not_found_page.py
@@ -1,4 +1,3 @@
-from frappe import _
 from frappe.website.page_controllers.template_page import TemplatePage
 
 class NotFoundPage(TemplatePage):
diff --git a/frappe/website/serve.py b/frappe/website/serve.py
index b6586dc1f3..eacaef96e1 100644
--- a/frappe/website/serve.py
+++ b/frappe/website/serve.py
@@ -17,6 +17,8 @@ from frappe.website.render import build_response, resolve_path
 def get_response(path=None, http_status_code=200):
 	"""render html page"""
 	query_string = None
+	response = None
+
 	if not path:
 		path = frappe.local.request.path
 		query_string = frappe.local.request.query_string
@@ -25,12 +27,11 @@ def get_response(path=None, http_status_code=200):
 		path = path.strip('/ ')
 		resolve_redirect(path, query_string)
 		path = resolve_path(path)
-
 		# there is no way to determine the type of the page based on the route
 		# so evaluate each type of page sequentially
 		renderers = [StaticPage, TemplatePage, ListPage, WebFormPage, DocumentPage, PrintPage, NotFoundPage]
-		for resolver in renderers:
-			response = resolver(path, http_status_code).get()
+		for renderer in renderers:
+			response = renderer(path, http_status_code).get()
 			if response:
 				break
 	except frappe.Redirect: