diff --git a/erpnext/patches/v4_0/new_address_template.py b/erpnext/patches/v4_0/new_address_template.py
index cebfa9a..d0f5ab0 100644
--- a/erpnext/patches/v4_0/new_address_template.py
+++ b/erpnext/patches/v4_0/new_address_template.py
@@ -3,6 +3,10 @@
 def execute():
 	frappe.reload_doc("utilities", "doctype", "address_template")
 	if not frappe.db.sql("select name from `tabAddress Template`"):
-		d = frappe.new_doc("Address Template")
-		d.update({"country":frappe.db.get_default("country")})
-		d.insert()
+		try:
+			d = frappe.new_doc("Address Template")
+			d.update({"country":frappe.db.get_default("country")})
+			d.insert()
+		except:
+			print frappe.get_traceback()
+
diff --git a/erpnext/utilities/doctype/address/address.py b/erpnext/utilities/doctype/address/address.py
index 01b9d9a..8fd5cb1 100644
--- a/erpnext/utilities/doctype/address/address.py
+++ b/erpnext/utilities/doctype/address/address.py
@@ -62,7 +62,7 @@
 			{"is_default": 1}, "template")
 
 	if not template:
-		frappe.throw(_("No default Address Template found. Please create a new one"))
+		frappe.throw(_("No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template."))
 
 	return frappe.render_template(template, address_dict)