diff --git a/src/main/java/org/springframework/data/jpa/domain/support/AuditingEntityListener.java b/src/main/java/org/springframework/data/jpa/domain/support/AuditingEntityListener.java
index b629467af..afc33a2a0 100644
--- a/src/main/java/org/springframework/data/jpa/domain/support/AuditingEntityListener.java
+++ b/src/main/java/org/springframework/data/jpa/domain/support/AuditingEntityListener.java
@@ -64,7 +64,9 @@ public class AuditingEntityListener<T> {
 	 */
 	@PrePersist
 	public void touchForCreate(Object target) {
-		handler.markCreated(target);
+		if (handler != null) {
+			handler.markCreated(target);
+		}
 	}
 
 	/**
@@ -75,6 +77,8 @@ public class AuditingEntityListener<T> {
 	 */
 	@PreUpdate
 	public void touchForUpdate(Object target) {
-		handler.markModified(target);
+		if (handler != null) {
+			handler.markModified(target);
+		}
 	}
 }