diff --git a/erpnext/patches/v10_0/added_extra_gst_custom_field.py b/erpnext/patches/v10_0/added_extra_gst_custom_field.py
index 98b18202fe..000e8fd638 100644
--- a/erpnext/patches/v10_0/added_extra_gst_custom_field.py
+++ b/erpnext/patches/v10_0/added_extra_gst_custom_field.py
@@ -6,4 +6,7 @@ def execute():
 	if not company:
 		return
 
+	frappe.reload_doc("hr", "doctype", "Employee Tax Exemption Declaration")
+	frappe.reload_doc("hr", "doctype", "Employee Tax Exemption Proof Submission")
+
 	make_custom_fields(update=False)
\ No newline at end of file
diff --git a/erpnext/patches/v11_0/refactor_erpnext_shopify.py b/erpnext/patches/v11_0/refactor_erpnext_shopify.py
index d31afe5550..68a37d5fd8 100644
--- a/erpnext/patches/v11_0/refactor_erpnext_shopify.py
+++ b/erpnext/patches/v11_0/refactor_erpnext_shopify.py
@@ -21,9 +21,13 @@ def execute():
 		setup_app_type()
 
 def setup_app_type():
-	shopify_settings = frappe.get_doc("Shopify Settings")
-	shopify_settings.app_type = 'Private'
-	shopify_settings.update_price_in_erpnext_price_list =  0 if getattr(shopify_settings, 'push_prices_to_shopify', None) else 1
-	shopify_settings.flags.ignore_mandatory = True
-	shopify_settings.ignore_permissions = True
-	shopify_settings.save()
+	try:
+		shopify_settings = frappe.get_doc("Shopify Settings")
+		shopify_settings.app_type = 'Private'
+		shopify_settings.update_price_in_erpnext_price_list =  0 if getattr(shopify_settings, 'push_prices_to_shopify', None) else 1
+		shopify_settings.flags.ignore_mandatory = True
+		shopify_settings.ignore_permissions = True
+		shopify_settings.save()
+	except Exception:
+		frappe.db.set_value("Shopify Shopify", None, "enable_shopify", 0)
+		frappe.log_error(frappe.get_traceback())
\ No newline at end of file