diff --git a/src/main/java/de/ids_mannheim/korap/KorapIndex.java b/src/main/java/de/ids_mannheim/korap/KorapIndex.java
index 83718d8..685d268 100644
--- a/src/main/java/de/ids_mannheim/korap/KorapIndex.java
+++ b/src/main/java/de/ids_mannheim/korap/KorapIndex.java
@@ -83,7 +83,9 @@
 import org.slf4j.LoggerFactory;
 
 /*
-  Todo: Use FieldCache!
+  TODO: Support layer for specific foundries (IMPORTANT)
+
+  TODO: Use FieldCache!
   TODO: Reuse the indexreader everywhere - it should be threadsafe!
 
   http://invertedindex.blogspot.co.il/2009/04/lucene-dociduid-mapping-and-payload.html
@@ -608,7 +610,7 @@
 		// Filter out bad foundries
 		for (i = foundry.size() - 1; i >= 0 ; i--) {
 		    if (!harmlessFoundry.matcher(foundry.get(i)).matches()) {
-			throw new QueryException("Invalid foundry requested: " + foundry.get(i));
+			throw new QueryException("Invalid foundry requested: '" + foundry.get(i) + "'");
 			// foundry.remove(i);
 		    };
 		};