diff --git a/erpnext/__version__.py b/erpnext/__version__.py
index bc63eb8c6fc..82beb8b0873 100644
--- a/erpnext/__version__.py
+++ b/erpnext/__version__.py
@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '6.1.0'
+__version__ = '6.1.1'
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 30081262e74..56bda40d156 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -27,7 +27,7 @@ blogs.
 """
 app_icon = "icon-th"
 app_color = "#e74c3c"
-app_version = "6.1.0"
+app_version = "6.1.1"
 github_link = "https://github.com/frappe/erpnext"
 
 error_report_email = "support@erpnext.com"
diff --git a/erpnext/patches/v6_0/fix_planned_qty.py b/erpnext/patches/v6_0/fix_planned_qty.py
index b523350e8da..e8ed1d05302 100644
--- a/erpnext/patches/v6_0/fix_planned_qty.py
+++ b/erpnext/patches/v6_0/fix_planned_qty.py
@@ -6,8 +6,9 @@ import frappe
 from erpnext.stock.stock_balance import get_planned_qty, update_bin_qty
 
 def execute():
-	for item_code, warehouse in frappe.db.sql("""select distinct production_item, fg_warehouse 
+	for item_code, warehouse in frappe.db.sql("""select distinct production_item, fg_warehouse
 		from `tabProduction Order`"""):
-			update_bin_qty(item_code, warehouse, {
-				"planned_qty": get_planned_qty(item_code, warehouse)
-			})
\ No newline at end of file
+			if frappe.db.exists("Item", item_code) and frappe.db.exists("Warehouse", warehouse):
+				update_bin_qty(item_code, warehouse, {
+					"planned_qty": get_planned_qty(item_code, warehouse)
+				})
diff --git a/setup.py b/setup.py
index 0f22c27e901..29073384bb6 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = "6.1.0"
+version = "6.1.1"
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()