diff --git a/pom.xml b/pom.xml
index b0bed839f..8b71656e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
 		<source.level>1.7</source.level>
 		<target.level>1.7</target.level>
 
-		<neo4j.version>2.0.3</neo4j.version>
+		<neo4j.version>2.1.2</neo4j.version>
 
 		<neo4j.spatial.version>0.12-neo4j-2.0.1</neo4j.spatial.version>
 		<neo4j.graph-collections.version>0.7.1-neo4j-2.0.1</neo4j.graph-collections.version>
diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/Neo4jExceptionTranslator.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/Neo4jExceptionTranslator.java
index 194cbdff8..87a21ab50 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/Neo4jExceptionTranslator.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/Neo4jExceptionTranslator.java
@@ -22,10 +22,10 @@ import org.neo4j.graphdb.TransactionFailureException;
 import org.neo4j.index.impl.lucene.QueryNotPossibleException;
 import org.neo4j.kernel.DeadlockDetectedException;
 import org.neo4j.kernel.impl.core.ReadOnlyDbException;
+import org.neo4j.kernel.impl.locking.community.LockException;
 import org.neo4j.kernel.impl.nioneo.store.StoreFailureException;
 import org.neo4j.kernel.impl.persistence.IdGenerationFailedException;
 import org.neo4j.kernel.impl.transaction.IllegalResourceException;
-import org.neo4j.kernel.impl.transaction.LockException;
 import org.springframework.dao.*;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.data.neo4j.mapping.InvalidEntityTypeException;