diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/support/CassandraExceptionTranslator.java b/spring-cassandra/src/main/java/org/springframework/cassandra/support/CassandraExceptionTranslator.java
index b2fe93910..a2ab9a27d 100644
--- a/spring-cassandra/src/main/java/org/springframework/cassandra/support/CassandraExceptionTranslator.java
+++ b/spring-cassandra/src/main/java/org/springframework/cassandra/support/CassandraExceptionTranslator.java
@@ -62,12 +62,7 @@ import com.datastax.driver.core.exceptions.WriteTimeoutException;
 
 public class CassandraExceptionTranslator implements PersistenceExceptionTranslator {
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.springframework.dao.support.PersistenceExceptionTranslator#
-	 * translateExceptionIfPossible(java.lang.RuntimeException)
-	 */
+	@Override
 	public DataAccessException translateExceptionIfPossible(RuntimeException x) {
 
 		if (x instanceof DataAccessException) {
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraDataTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraDataTemplate.java
index 6e94b48d1..c4ebf9dfa 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraDataTemplate.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraDataTemplate.java
@@ -946,7 +946,7 @@ public class CassandraDataTemplate extends CassandraTemplate implements Cassandr
 			return callback.doInSession(getSession());
 
 		} catch (DataAccessException e) {
-			throw throwTranslated(e);
+			throw translateExceptionIfPossible(e);
 		}
 	}