diff --git a/frappe/core/doctype/user/test_user.py b/frappe/core/doctype/user/test_user.py
index 38c58268ef..8ed109ff9f 100644
--- a/frappe/core/doctype/user/test_user.py
+++ b/frappe/core/doctype/user/test_user.py
@@ -8,9 +8,8 @@ import requests
 from frappe.model.delete_doc import delete_doc
 from frappe.utils.data import today, add_to_date
 from frappe import _dict
-from frappe.limits import SiteExpiredError, update_limits, clear_limit
+from frappe.limits import update_limits, clear_limit
 from frappe.utils import get_url
-from frappe.installer import update_site_config
 from frappe.core.doctype.user.user import MaxUsersReachedError
 
 test_records = frappe.get_test_records('User')
@@ -145,6 +144,7 @@ class TestUser(unittest.TestCase):
 		clear_limit('users')
 
 	# def test_deny_multiple_sessions(self):
+	#	from frappe.installer import update_site_config
 	# 	clear_limit('users')
 	#
 	# 	# allow one session
@@ -179,13 +179,18 @@ class TestUser(unittest.TestCase):
 	# 	test_request(conn1)
 
 	def test_site_expiry(self):
+		user = frappe.get_doc('User', 'test@example.com')
+		user.enabled = 1
+		user.new_password = 'testpassword'
+		user.save()
+
 		update_limits({'expiry': add_to_date(today(), days=-1)})
 		frappe.local.conf = _dict(frappe.get_site_config())
 
 		frappe.db.commit()
 
-		res = requests.post(get_url(), params={'cmd': 'login', 'usr': 'test@example.com', 'pwd': 'testpassword',
-			'device': 'desktop'})
+		res = requests.post(get_url(), params={'cmd': 'login', 'usr':
+			'test@example.com', 'pwd': 'testpassword', 'device': 'desktop'})
 
 		# While site is expired status code returned is 417 Failed Expectation
 		self.assertEqual(res.status_code, 417)
diff --git a/frappe/utils/scheduler.py b/frappe/utils/scheduler.py
index 4fc8e45be3..d42ce14185 100755
--- a/frappe/utils/scheduler.py
+++ b/frappe/utils/scheduler.py
@@ -255,7 +255,7 @@ def reset_enabled_scheduler_events(login_manager):
 			frappe.db.set_global('enabled_scheduler_events', None)
 		except MySQLdb.OperationalError, e:
 			if e.args[0]==1205:
-				frappe.get_logger().error("Error in reset_enabled_scheduler_events")
+				frappe.log_error(frappe.get_traceback(), "Error in reset_enabled_scheduler_events")
 			else:
 				raise
 		else:
diff --git a/frappe/website/render.py b/frappe/website/render.py
index 3edf8ef5f3..d5cca7e5ae 100644
--- a/frappe/website/render.py
+++ b/frappe/website/render.py
@@ -244,5 +244,8 @@ def get_doctype_from_path(path):
 	return None, None
 
 def add_csrf_token(data):
-	return data.replace("<!-- csrf_token -->", '<script>frappe.csrf_token = "{0}";</script>'.format(
-			frappe.local.session.data.csrf_token))
+	if frappe.local.session:
+		return data.replace("<!-- csrf_token -->", '<script>frappe.csrf_token = "{0}";</script>'.format(
+				frappe.local.session.data.csrf_token))
+	else:
+		return data