diff --git a/hr/doctype/expense_claim/expense_claim.js b/hr/doctype/expense_claim/expense_claim.js
index 3497702723b..ad3dacebda6 100644
--- a/hr/doctype/expense_claim/expense_claim.js
+++ b/hr/doctype/expense_claim/expense_claim.js
@@ -25,9 +25,11 @@ erpnext.hr.ExpenseClaimController = wn.ui.form.Controller.extend({
 
 				// credit to bank
 				var d1 = wn.model.add_child(jv, 'Journal Voucher Detail', 'entries');
-				d1.account = r.message[0].account;
 				d1.credit = cur_frm.doc.total_sanctioned_amount;
-				d1.balance = r.message[0].balance;
+				if(r.message) {
+					d1.account = r.message[0].account;
+					d1.balance = r.message[0].balance;
+				}
 
 				loaddoc('Journal Voucher', jv.name);
 			}
diff --git a/stock/doctype/stock_reconciliation/stock_reconciliation.py b/stock/doctype/stock_reconciliation/stock_reconciliation.py
index dbe2d2a4c53..617ec698c4a 100644
--- a/stock/doctype/stock_reconciliation/stock_reconciliation.py
+++ b/stock/doctype/stock_reconciliation/stock_reconciliation.py
@@ -286,6 +286,9 @@ class DocType(StockController):
 		
 		item_list = [d.item_code for d in self.entries]
 		warehouse_list = [d.warehouse for d in self.entries]
+		if not (item_list and warehouse_list):
+			webnotes.throw(_("Invalid Item or Warehouse Data"))
+		
 		stock_ledger_entries = self.get_stock_ledger_entries(item_list, warehouse_list)
 		
 		self.doc.stock_value_difference = 0.0