diff --git a/frappe/patches.txt b/frappe/patches.txt
index 29a53f9b63..2e270ddae2 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -135,7 +135,7 @@ execute:frappe.db.sql("delete from `tabWeb Page` where ifnull(template_path, '')
 frappe.patches.v7_0.rename_newsletter_list_to_email_group
 frappe.patches.v7_0.replace_upgrade_link_limit
 frappe.patches.v7_0.set_email_group
-frappe.patches.v7_1.setup_integration_services
+frappe.patches.v7_1.setup_integration_services #2016-09-15
 frappe.patches.v7_1.rename_chinese_language_codes
 execute:frappe.core.doctype.language.language.update_language_names()
 execute:frappe.db.set_value("Print Settings", "Print Settings", "add_draft_heading", 1)
diff --git a/frappe/patches/v7_1/setup_integration_services.py b/frappe/patches/v7_1/setup_integration_services.py
index 3f80558c9f..9ef9ecaa46 100644
--- a/frappe/patches/v7_1/setup_integration_services.py
+++ b/frappe/patches/v7_1/setup_integration_services.py
@@ -11,8 +11,7 @@ app_list = [
 ]
 
 def execute():
-	if not frappe.db.exists("DocType", "Integration Service"):
-		return
+	frappe.reload_doc("integration_broker", "doctype", "integration_service")
 
 	installed_apps = frappe.get_installed_apps()
 
@@ -20,12 +19,15 @@ def execute():
 		if app_details["app_name"] in installed_apps:
 			try:
 				setup_integration_service(app_details)
+
+			except DataError:
+				pass
+
+			finally:
 				if app_details["remove"]:
 					uninstall_app(app_details["app_name"])
 
-				frappe.delete_doc("DocType", "Dropbox Backup")
-			except Exception:
-				pass
+	frappe.delete_doc("DocType", "Dropbox Backup")
 
 def setup_integration_service(app_details):
 	settings = get_app_settings(app_details)