diff --git a/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java b/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java
index b4bf2de8f..50f430775 100644
--- a/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java
+++ b/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java
@@ -125,12 +125,14 @@ public class SimpleJpaRepository<T, ID extends Serializable> implements JpaRepos
 
 		Assert.notNull(id, "The given id must not be null!");
 
-		if (!exists(id)) {
+		T entity = findOne(id);
+
+		if (entity == null) {
 			throw new EmptyResultDataAccessException(String.format("No %s entity with id %s exists!",
 					entityInformation.getJavaType(), id), 1);
 		}
 
-		delete(findOne(id));
+		delete(entity);
 	}
 
 	/*