diff --git a/erpnext/accounts/general_ledger.py b/erpnext/accounts/general_ledger.py
index 3fbbe39e2c..673149577d 100644
--- a/erpnext/accounts/general_ledger.py
+++ b/erpnext/accounts/general_ledger.py
@@ -15,7 +15,8 @@ def make_gl_entries(gl_map, cancel=False, adv_adj=False, merge_entries=True,
 	if gl_map:
 		if not cancel:
 			gl_map = process_gl_map(gl_map, merge_entries)
-			save_entries(gl_map, adv_adj, update_outstanding)
+			if gl_map:
+				save_entries(gl_map, adv_adj, update_outstanding)
 		else:
 			delete_gl_entries(gl_map, adv_adj=adv_adj, update_outstanding=update_outstanding)
 
diff --git a/erpnext/stock/doctype/warehouse/test_records.json b/erpnext/stock/doctype/warehouse/test_records.json
index e0941af26c..72071f88ca 100644
--- a/erpnext/stock/doctype/warehouse/test_records.json
+++ b/erpnext/stock/doctype/warehouse/test_records.json
@@ -13,7 +13,7 @@
  },
  {
   "company": "_Test Company 1",
-  "create_account_under": "Stock Assets - _TC",
+  "create_account_under": "Stock Assets - _TC1",
   "doctype": "Warehouse",
   "warehouse_name": "_Test Warehouse 2"
  },