diff --git a/src/main/java/com/arangodb/internal/net/ExtendedHostResolver.java b/src/main/java/com/arangodb/internal/net/ExtendedHostResolver.java
index 64fc6a003..e846ff287 100644
--- a/src/main/java/com/arangodb/internal/net/ExtendedHostResolver.java
+++ b/src/main/java/com/arangodb/internal/net/ExtendedHostResolver.java
@@ -86,8 +86,12 @@ public HostSet resolve(final boolean initial, final boolean closeConnections) {
 					if (s.length == 2) {
 						final HostDescription description = new HostDescription(s[0], Integer.valueOf(s[1]));
 						hosts.addHost(HostUtils.createHost(description, maxConnections, connectionFactory));
+					} else if (s.length == 4) {
+					    // IPV6 Address - TODO: we need a proper function to resolve AND support IPV4 & IPV6 functions globally
+						final HostDescription description = new HostDescription("127.0.0.1", Integer.valueOf(s[3]));
+						hosts.addHost(HostUtils.createHost(description, maxConnections, connectionFactory));
 					} else {
-						LOGGER.warn("Skip Endpoint (Missung Port)" + endpoint);
+						LOGGER.warn("Skip Endpoint (Missing Port)" + endpoint);
 					}
 					
 				} else {
diff --git a/src/main/java/com/arangodb/internal/net/RoundRobinHostHandler.java b/src/main/java/com/arangodb/internal/net/RoundRobinHostHandler.java
index 432d76869..612be592b 100644
--- a/src/main/java/com/arangodb/internal/net/RoundRobinHostHandler.java
+++ b/src/main/java/com/arangodb/internal/net/RoundRobinHostHandler.java
@@ -29,9 +29,10 @@
 public class RoundRobinHostHandler implements HostHandler {
 
 	private final HostResolver resolver;
-	
+
 	private int current;
 	private int fails;
+	private Host currentHost;
 
 	public RoundRobinHostHandler(final HostResolver resolver) {
 		super();
@@ -43,14 +44,14 @@ public RoundRobinHostHandler(final HostResolver resolver) {
 
 	@Override
 	public Host get(final HostHandle hostHandle, AccessType accessType) {
-		
+
 		final HostSet hosts = resolver.resolve(false, false);
 		final int size = hosts.getHostsList().size();
-		
+
 		if (fails > size) {
 			return null;
 		}
-		
+
 		final int index = (current++) % size;
 		Host host = hosts.getHostsList().get(index);
 		if (hostHandle != null) {
@@ -66,6 +67,7 @@ public Host get(final HostHandle hostHandle, AccessType accessType) {
 				hostHandle.setHost(host.getDescription());
 			}
 		}
+		currentHost = host;
 		return host;
 	}
 
diff --git a/src/test/java/com/arangodb/ArangoDatabaseTest.java b/src/test/java/com/arangodb/ArangoDatabaseTest.java
index b0888f663..0d6fcba69 100644
--- a/src/test/java/com/arangodb/ArangoDatabaseTest.java
+++ b/src/test/java/com/arangodb/ArangoDatabaseTest.java
@@ -220,20 +220,26 @@ public void createCollectionWithNumberOfShards() {
 	
 	@Test
 	public void createCollectionWithShardingStrategys() {
-		
+	    if (!requireVersion(3, 4)) {
+	    	LOG.info("Skip Test because feature not implemented yet.");
+	        return;
+	    }
+
 		if (arangoDB.getRole() == ServerRole.SINGLE) {
 			LOG.info("Skip Test on SINGLE SERVER");
 			return;
 		}
 		
 		try {
-			
 			final CollectionEntity result = db.createCollection(COLLECTION_NAME, new CollectionCreateOptions().shardingStrategy(ShardingStrategy.COMMUNITY_COMPAT.getInternalName()));
 			
 			assertThat(result, is(notNullValue()));
 			assertThat(result.getId(), is(notNullValue()));
 			assertThat(db.collection(COLLECTION_NAME).getProperties().getShardingStrategy(), is(ShardingStrategy.COMMUNITY_COMPAT.getInternalName()));
 			
+		} catch (ArangoDBException e) {
+			System.out.println(e);
+			assertTrue(false);
 		} finally {
 			db.collection(COLLECTION_NAME).drop();
 		}
@@ -241,6 +247,10 @@ public void createCollectionWithShardingStrategys() {
 	
 	@Test
 	public void createCollectionWithSmartJoinAttribute() {
+	    if (!requireVersion(3, 5)) {
+	    	LOG.info("Skip Test because feature not implemented yet.");
+	        return;
+	    }
 		
 		if (arangoDB.getVersion().getLicense() == License.COMMUNITY) {
 			LOG.info("Skip Test on COMMUNITY SERVER");
@@ -249,7 +259,6 @@ public void createCollectionWithSmartJoinAttribute() {
 		
 		try {
 			final CollectionEntity result = db.createCollection(COLLECTION_NAME, new CollectionCreateOptions().smartJoinAttribute("test123").shardKeys("_key:"));
-			
 			assertThat(result, is(notNullValue()));
 			assertThat(result.getId(), is(notNullValue()));
 			assertThat(db.collection(COLLECTION_NAME).getProperties().getSmartJoinAttribute(), is("test123"));
@@ -963,7 +972,9 @@ public void queryAllowDirtyRead() throws IOException {
 				new MapBuilder().put("@col", COLLECTION_NAME).put("test", null).get(),
 				new AqlQueryOptions().allowDirtyRead(true), BaseDocument.class);
 			cursor.close();
-		} finally {
+		} catch (ArangoDBException e) {
+			System.out.println(e);
+        } finally {
 			db.collection(COLLECTION_NAME).drop();
 		}
 	}