diff --git a/src/main/java/org/aksw/gerbil/evaluate/EvaluatorFactory.java b/src/main/java/org/aksw/gerbil/evaluate/EvaluatorFactory.java
index 553588d4d..63c028aad 100644
--- a/src/main/java/org/aksw/gerbil/evaluate/EvaluatorFactory.java
+++ b/src/main/java/org/aksw/gerbil/evaluate/EvaluatorFactory.java
@@ -134,13 +134,11 @@ protected Evaluator createEvaluator(ExperimentType type, ExperimentTaskConfigura
             MatchingsSearcher<ClassifiedSpanMeaning> searcher = (MatchingsSearcher<ClassifiedSpanMeaning>) MatchingsSearcherFactory
                     .createSpanMatchingsSearcher(configuration.matching);
             return new ClassifyingEvaluatorDecorator<MeaningSpan, ClassifiedSpanMeaning>(
-                    new GSInKBClassifyingEvaluatorDecorator<ClassifiedSpanMeaning>(
-                            new ClassConsideringFMeasureCalculator<ClassifiedSpanMeaning>(
-                                    new MatchingsCounterImpl<ClassifiedSpanMeaning>(
-                                            new CompoundMatchingsSearcher<ClassifiedSpanMeaning>(searcher,
-                                                    new ClassifiedMeaningMatchingsSearcher<ClassifiedSpanMeaning>())),
-                                    MarkingClasses.IN_KB, MarkingClasses.EE, MarkingClasses.GS_IN_KB),
-                            searcher),
+                    new ClassConsideringFMeasureCalculator<ClassifiedSpanMeaning>(
+                            new MatchingsCounterImpl<ClassifiedSpanMeaning>(
+                                    new CompoundMatchingsSearcher<ClassifiedSpanMeaning>(searcher,
+                                            new ClassifiedMeaningMatchingsSearcher<ClassifiedSpanMeaning>())),
+                            MarkingClasses.IN_KB, MarkingClasses.EE, MarkingClasses.GS_IN_KB),
                     new UriBasedMeaningClassifier<ClassifiedSpanMeaning>(classifier, MarkingClasses.IN_KB),
                     new EmergingEntityMeaningClassifier<ClassifiedSpanMeaning>());
         }
diff --git a/src/test/java/org/aksw/gerbil/annotator/http/WaitingDocumentReturningServerMock.java b/src/test/java/org/aksw/gerbil/annotator/http/WaitingDocumentReturningServerMock.java
index d86bd5137..de8a4f01e 100644
--- a/src/test/java/org/aksw/gerbil/annotator/http/WaitingDocumentReturningServerMock.java
+++ b/src/test/java/org/aksw/gerbil/annotator/http/WaitingDocumentReturningServerMock.java
@@ -66,6 +66,7 @@ public void handle(Request request, Response response) {
         }
         String responseString;
         if (documents.containsKey(requestDoc.getDocumentURI())) {
+            LOGGER.error("Couldn't find document with URI \"{}\". Returning request document.", requestDoc.getDocumentURI());
             responseString = nifCreator.getDocumentAsNIFString(documents.get(requestDoc.getDocumentURI()));
         } else {
             responseString = nifCreator.getDocumentAsNIFString(requestDoc);