diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/mapping/JpaPersistentEntityImpl.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/mapping/JpaPersistentEntityImpl.java
index a53acee9b..5fd1d17e6 100644
--- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/mapping/JpaPersistentEntityImpl.java
+++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/mapping/JpaPersistentEntityImpl.java
@@ -79,10 +79,8 @@ class JpaPersistentEntityImpl<T> extends BasicPersistentEntity<T, JpaPersistentP
 		super.verify();
 
 		JpaPersistentProperty versionProperty = getVersionProperty();
-
-		if (versionProperty != null && versionProperty.isAnnotationPresent(Version.class)) {
-			throw new IllegalArgumentException(String.format(INVALID_VERSION_ANNOTATION, versionProperty));
-		}
+		Assert.state(versionProperty != null && versionProperty.isAnnotationPresent(Version.class),
+				() -> String.format(INVALID_VERSION_ANNOTATION, versionProperty));
 	}
 
 	JpaMetamodel getMetamodel() {