diff --git a/frappe/templates/generators/web_form.html b/frappe/templates/generators/web_form.html
index 21495d8eaf..0079926ee4 100644
--- a/frappe/templates/generators/web_form.html
+++ b/frappe/templates/generators/web_form.html
@@ -178,7 +178,7 @@
 			</thead>
 			<tbody>
 				{{ render_row(field, {}, True) }}
-				{% if doc.get(field.fieldname) %}
+				{% if doc and doc.get(field.fieldname) %}
 					{% for d in doc.get(field.fieldname) %}
 						{{ render_row(field, d) }}
 					{% endfor %}
diff --git a/frappe/website/doctype/web_form/web_form.py b/frappe/website/doctype/web_form/web_form.py
index 3e4cdb7681..6fa9de408c 100644
--- a/frappe/website/doctype/web_form/web_form.py
+++ b/frappe/website/doctype/web_form/web_form.py
@@ -167,7 +167,7 @@ def get_context(context):
 				"<br>").replace("'", "\'")
 
 		self.add_custom_context_and_script(context)
-
+		
 	def add_custom_context_and_script(self, context):
 		'''Update context from module if standard and append script'''
 		if self.is_standard:
@@ -336,4 +336,4 @@ def make_route_string(parameters):
 			if key != "is_web_form":
 				route_string += route_string + delimeter + key + "=" + cstr(parameters[key])
 				delimeter = '&'
-	return (route_string,delimeter)
\ No newline at end of file
+	return (route_string, delimeter)
\ No newline at end of file