diff --git a/pom.xml b/pom.xml
index a3592c394..0b58c7a29 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
 		<dist.id>spring-data-cassandra</dist.id>
 		<springdata.commons>1.8.0.BUILD-SNAPSHOT</springdata.commons>
 		<cassandra-unit.version>2.0.2.1</cassandra-unit.version>
-		<cassandra-driver-dse.version>2.0.1</cassandra-driver-dse.version>
+		<cassandra-driver-dse.version>2.0.2</cassandra-driver-dse.version>
 		<el.version>1.0</el.version>
 		<failsafe.version>2.16</failsafe.version>
 		<jamm.version>0.2.5</jamm.version>
diff --git a/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraConnectionFailureException.java b/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraConnectionFailureException.java
index 21b05bd16..6f62ebc1e 100644
--- a/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraConnectionFailureException.java
+++ b/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraConnectionFailureException.java
@@ -15,7 +15,7 @@
  */
 package org.springframework.cassandra.support.exception;
 
-import java.net.InetAddress;
+import java.net.InetSocketAddress;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -31,14 +31,14 @@ public class CassandraConnectionFailureException extends DataAccessResourceFailu
 
 	private static final long serialVersionUID = 6299912054261646552L;
 
-	private final Map<InetAddress, Throwable> messagesByHost = new HashMap<InetAddress, Throwable>();
+	private final Map<InetSocketAddress, Throwable> messagesByHost = new HashMap<InetSocketAddress, Throwable>();
 
-	public CassandraConnectionFailureException(Map<InetAddress, Throwable> map, String msg, Throwable cause) {
+	public CassandraConnectionFailureException(Map<InetSocketAddress, Throwable> map, String msg, Throwable cause) {
 		super(msg, cause);
 		this.messagesByHost.putAll(map);
 	}
 
-	public Map<InetAddress, Throwable> getMessagesByHost() {
+	public Map<InetSocketAddress, Throwable> getMessagesByHost() {
 		return Collections.unmodifiableMap(messagesByHost);
 	}
 }