diff --git a/lib/SimpleSAML/XML/MetaDataStore.php b/lib/SimpleSAML/XML/MetaDataStore.php
index 5f3d3a72d82264e3dbe4f702fcbfe886dfcd1811..bf550d730439a6e8959b4d30fbe495b64fb9431a 100644
--- a/lib/SimpleSAML/XML/MetaDataStore.php
+++ b/lib/SimpleSAML/XML/MetaDataStore.php
@@ -73,7 +73,7 @@ class SimpleSAML_XML_MetaDataStore {
 		}
 		
 		if (!isset($this->hostmap[$set])) {
-			throw new Exception('No default entities defined for metadata set [' . $set . ']');
+			throw new Exception('No default entities defined for metadata set [' . $set . '] (host:' . $currenthost. ')');
 		}
 		if (!isset($currenthost)) {
 			throw new Exception('Could not get HTTP_HOST, in order to resolve default entity ID');