diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContext.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContext.java
index 56fb375d5..809c283bf 100644
--- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContext.java
+++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContext.java
@@ -136,10 +136,8 @@ public class JpaMetamodelMappingContext
 
 			JpaMetamodel metamodel = getMetamodel(type);
 
-			if (metamodel == null) {
-				throw new IllegalArgumentException(String.format("Required JpaMetamodel not found for %s", type));
-			}
-
+			Assert.notNull(metamodel, () -> String.format("Required JpaMetamodel not found for %s", type));
+			
 			return metamodel;
 		}