diff --git a/erpnext/patches/v6_20x/remove_customer_supplier_roles.py b/erpnext/patches/v6_20x/remove_customer_supplier_roles.py
index f4167bfa4f7..eb69845c844 100644
--- a/erpnext/patches/v6_20x/remove_customer_supplier_roles.py
+++ b/erpnext/patches/v6_20x/remove_customer_supplier_roles.py
@@ -3,6 +3,7 @@ import frappe
 
 def execute():
 	frappe.reload_doc("buying", "doctype", "request_for_quotation_supplier")
+	frappe.reload_doc("buying", "doctype", "request_for_quotation_item")
 	frappe.reload_doc("buying", "doctype", "request_for_quotation")
 	frappe.reload_doc("projects", "doctype", "timesheet")
 	
diff --git a/erpnext/patches/v7_0/make_guardian.py b/erpnext/patches/v7_0/make_guardian.py
index 7daad0e0114..b6b0a808734 100644
--- a/erpnext/patches/v7_0/make_guardian.py
+++ b/erpnext/patches/v7_0/make_guardian.py
@@ -2,12 +2,16 @@ from __future__ import unicode_literals
 import frappe
 
 def execute():
-	students = frappe.get_list("Student", fields=["name", "father_name", "father_email_id", "mother_name", "mother_email_id"])
-	for stud in students:
-		if stud.father_name:
-			make_guardian(stud.father_name, stud.name, stud.father_email_id)
-		if stud.mother_name:
-			make_guardian(stud.mother_name, stud.name, stud.mother_email_id)
+	if frappe.db.exists("DocType", "Student") and "father_name" in frappe.db.get_table_columns("Student"):
+		frappe.reload_doc("schools", "doctype", "student")
+	
+		students = frappe.get_list("Student", fields=["name", "father_name", "father_email_id", 
+			"mother_name", "mother_email_id"])
+		for stud in students:
+			if stud.father_name:
+				make_guardian(stud.father_name, stud.name, stud.father_email_id)
+			if stud.mother_name:
+				make_guardian(stud.mother_name, stud.name, stud.mother_email_id)
 		
 def make_guardian(name, student, email=None):
 	frappe.get_doc({