diff --git a/erpnext/patches/v6_6/remove_fiscal_year_from_leave_allocation.py b/erpnext/patches/v6_6/remove_fiscal_year_from_leave_allocation.py
index 1b248415db1..b150173a92d 100644
--- a/erpnext/patches/v6_6/remove_fiscal_year_from_leave_allocation.py
+++ b/erpnext/patches/v6_6/remove_fiscal_year_from_leave_allocation.py
@@ -2,14 +2,15 @@ from __future__ import unicode_literals
 import frappe
 
 def execute():
-	for leave_allocation in frappe.db.sql("select name, fiscal_year from `tabLeave Allocation`", as_dict=True):
-		year_start_date, year_end_date = frappe.db.get_value("Fiscal Year", leave_allocation["fiscal_year"],
-			["year_start_date", "year_end_date"])
-		
-		frappe.db.sql("""update `tabLeave Allocation` 
-			set from_date=%s, to_date=%s where name=%s""", 
-			(year_start_date, year_end_date, leave_allocation["name"]))
-			
-		frappe.db.commit()
-			
-		
\ No newline at end of file
+	if frappe.db.has_column("Leave Allocation", "fiscal_year"):
+		for leave_allocation in frappe.db.sql("select name, fiscal_year from `tabLeave Allocation`", as_dict=True):
+			dates = frappe.db.get_value("Fiscal Year", leave_allocation["fiscal_year"],
+				["year_start_date", "year_end_date"])
+
+			if dates:
+				year_start_date, year_end_date = dates
+
+				frappe.db.sql("""update `tabLeave Allocation`
+					set from_date=%s, to_date=%s where name=%s""",
+					(year_start_date, year_end_date, leave_allocation["name"]))
+