diff --git a/oaipmh-core/pom.xml b/oaipmh-core/pom.xml
index 4e9d98ac5a89c0d0e503f6f9d4a444d9c6dbc1a1..fb17a46033fab1f30f6a02898297edc2e1224d3a 100644
--- a/oaipmh-core/pom.xml
+++ b/oaipmh-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>oaipmh</artifactId>
 		<groupId>info.textgrid.middleware</groupId>
-		<version>2.5.16-SNAPSHOT</version>
+		<version>2.5.17-SNAPSHOT</version>
 	</parent>
 	<groupId>info.textgrid.middleware</groupId>
 	<artifactId>oaipmh-core</artifactId>
diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhOnlineTests.java b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhOnlineTests.java
index 2f19c2dd7533d7e684c76d052e6fa9b423cb0e06..a7d4f145d09ae518c75dd5467cd7554ab02f35f1 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhOnlineTests.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhOnlineTests.java
@@ -27,9 +27,8 @@ import org.junit.Test;
 public class OaiPmhOnlineTests {
 
 	// The OAIPMH host to be tested.
-	 private static String host =
-	 "http://textgrid-esx1.gwdg.de/1.0/tgoaipmh/";
-	//	private static String		host	= "http://textgridlab.org/1.0/tgoaipmh/";
+	private static String		host	= "http://textgrid-esx1.gwdg.de/1.0/tgoaipmh/";
+	// private static String host = "http://textgridlab.org/1.0/tgoaipmh/";
 
 	// Some output finals.
 	private static final String	ERROR	= ">>> ERROR";
@@ -333,11 +332,24 @@ public class OaiPmhOnlineTests {
 			assertTrue(false);
 		}
 
+		// Count response objects at first.
+		int recordCount = 0;
+		int i = res.indexOf("<" + recordOrHeader + ">", 0);
+		while (i != -1) {
+			recordCount++;
+			i++;
+			i = res.indexOf("<" + recordOrHeader + ">", i);
+		}
+
+		System.out.println("\t" + recordOrHeader + "s:  " + recordCount);
+
 		// Check if token tag is existing.
 		int tokStart = res.indexOf("<resumptionToken");
 		int tokEnd = res.indexOf("</resumptionToken");
 
 		if (tokStart == -1 && tokEnd == -1) {
+			System.out.println("\ttoken:    no token");
+
 			return "-1";
 		}
 
@@ -365,17 +377,6 @@ public class OaiPmhOnlineTests {
 				cursorStr.indexOf("\"")));
 		System.out.println("\tsize:     " + size + " / " + cursor);
 
-		// Count response objects.
-		int recordCount = 0;
-		int i = res.indexOf("<" + recordOrHeader + ">", 0);
-		while (i != -1) {
-			recordCount++;
-			i++;
-			i = res.indexOf("<" + recordOrHeader + ">", i);
-		}
-
-		System.out.println("\t" + recordOrHeader + "s:  " + recordCount);
-
 		// If token is provided, and we have less than 100 elements: mekkern!
 		if (!restok.isEmpty()) {
 			synchronized (OaiPmhOnlineTests.class) {
diff --git a/oaipmh-webapp/pom.xml b/oaipmh-webapp/pom.xml
index 8cbb950c4aa204fddd9bc5c7d70a58701c3068f1..39becfdc58956a07fa44ab419fd6c2ae6ccfd18e 100644
--- a/oaipmh-webapp/pom.xml
+++ b/oaipmh-webapp/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>oaipmh</artifactId>
 		<groupId>info.textgrid.middleware</groupId>
-		<version>2.5.16-SNAPSHOT</version>
+		<version>2.5.17-SNAPSHOT</version>
 	</parent>
 	<groupId>info.textgrid.middleware</groupId>
 	<artifactId>oaipmh-webapp</artifactId>
diff --git a/pom.xml b/pom.xml
index 67a6495946dcae55dfdcd6cd9508405df89278ea..224cdcf33aadb42e769c8b247b82975a6d443eb6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>info.textgrid.middleware</groupId>
   <artifactId>oaipmh</artifactId>
-  <version>2.5.16-SNAPSHOT</version>
+  <version>2.5.17-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>DARIAHDE :: OAI-PMH DataProvider</name>
   <properties>