From f9bcb11d35e49c0b4430865854f14c1f1b616d25 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Mon, 28 May 2018 16:53:43 +0530
Subject: [PATCH] [minor] website-fix

---
 frappe/website/website_generator.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frappe/website/website_generator.py b/frappe/website/website_generator.py
index 9b97510a35..d25c56b6b1 100644
--- a/frappe/website/website_generator.py
+++ b/frappe/website/website_generator.py
@@ -17,6 +17,9 @@ class WebsiteGenerator(Document):
 
 	def get_website_properties(self, key=None, default=None):
 		out = getattr(self, '_website', None) or getattr(self, 'website', None) or {}
+		if not isinstance(out, dict):
+			# website may be a property too, so ignore
+			out = {}
 		if key:
 			return out.get(key, default)
 		else: