diff --git a/controllers/buying_controller.py b/controllers/buying_controller.py
index 0c25b9855e..9e181bc8fe 100644
--- a/controllers/buying_controller.py
+++ b/controllers/buying_controller.py
@@ -50,8 +50,7 @@ class BuyingController(StockController):
 		for warehouse, company in webnotes.conn.get_values("Warehouse", 
 			self.doclist.get_distinct_values("warehouse"), "company").items():
 			if company and company != self.doc.company:
-				webnotes.msgprint(_("Warehouse must belong to company") + \
-					(": %s (%s, %s)" % (warehouse, company, self.doc.company)),
+				webnotes.msgprint(_("Company mismatch for Warehouse") + (": %s" % (warehouse,)),
 					raise_exception=WrongWarehouseCompany)
 
 	def validate_stock_or_nonstock_items(self):
diff --git a/setup/doctype/price_list/test_price_list.py b/setup/doctype/price_list/test_price_list.py
index 30262dc8aa..fe87821904 100644
--- a/setup/doctype/price_list/test_price_list.py
+++ b/setup/doctype/price_list/test_price_list.py
@@ -2,6 +2,7 @@ test_records = [
 	[{
 		"doctype": "Price List",
 		"price_list_name": "_Test Price List",
-		"currency": "INR"
+		"currency": "INR",
+		"valid_for_all_countries": 1
 	}]
 ]
\ No newline at end of file