diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateTemplate.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateTemplate.java
index 91a85875..c9761397 100644
--- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateTemplate.java
+++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateTemplate.java
@@ -131,7 +131,9 @@ public class JdbcAggregateTemplate implements JdbcAggregateOperations {
 	}
 
 	/**
-	 * @param entityCallbacks
+	 * Sets the callbacks to be invoked on life cycle events.
+	 *
+	 * @param entityCallbacks must not be {@literal null}.
 	 * @since 1.1
 	 */
 	public void setEntityCallbacks(EntityCallbacks entityCallbacks) {
@@ -216,10 +218,10 @@ public class JdbcAggregateTemplate implements JdbcAggregateOperations {
 		Assert.notNull(domainType, "Domain type must not be null!");
 
 		T entity = accessStrategy.findById(id, domainType);
-		if (entity != null) {
-			return triggerAfterConvert(entity);
+		if (entity == null) {
+			return null;
 		}
-		return entity;
+		return triggerAfterConvert(entity);
 	}
 
 	/*