diff --git a/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py b/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py
index 380e3a2..b90a919 100644
--- a/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py
+++ b/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py
@@ -193,6 +193,8 @@
 	accounts, accounts_by_name = get_account_heads(root_type,
 		companies, filters)
 
+	if not accounts: return []
+
 	company_currency = get_company_currency(filters)
 
 	gl_entries_by_account = {}
@@ -246,7 +248,7 @@
 	accounts = get_accounts(root_type, filters)
 
 	if not accounts:
-		return None
+		return None, None
 
 	accounts, accounts_by_name, parent_children_map = filter_accounts(accounts)