diff --git a/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryLookupStrategy.java b/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryLookupStrategy.java
index 4b408e5c7..52ed560bb 100644
--- a/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryLookupStrategy.java
+++ b/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryLookupStrategy.java
@@ -89,7 +89,12 @@ public final class JpaQueryLookupStrategy {
 		@Override
 		protected RepositoryQuery resolveQuery(JpaQueryMethod method, EntityManager em, NamedQueries namedQueries) {
 
-			return new PartTreeJpaQuery(method, em);
+			try {
+				return new PartTreeJpaQuery(method, em);
+			} catch (IllegalArgumentException e) {
+				throw new IllegalArgumentException(String.format("Could not create query metamodel for method %s!",
+						method.toString()), e);
+			}
 		}
 	}