diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/AbstractJPASQLQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/AbstractJPASQLQuery.java
index c06033302..de956dc16 100644
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/AbstractJPASQLQuery.java
+++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/AbstractJPASQLQuery.java
@@ -13,27 +13,10 @@
  */
 package com.mysema.query.jpa.sql;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-import javax.persistence.EntityManager;
-import javax.persistence.FlushModeType;
-import javax.persistence.LockModeType;
-import javax.persistence.Query;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
 import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.NonUniqueResultException;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.QueryModifiers;
-import com.mysema.query.SearchResults;
+import com.mysema.query.*;
 import com.mysema.query.jpa.AbstractSQLQuery;
 import com.mysema.query.jpa.NativeSQLSerializer;
 import com.mysema.query.jpa.QueryHandler;
@@ -43,6 +26,17 @@ import com.mysema.query.sql.Configuration;
 import com.mysema.query.types.Expression;
 import com.mysema.query.types.FactoryExpression;
 import com.mysema.query.types.FactoryExpressionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.annotation.Nullable;
+import javax.persistence.EntityManager;
+import javax.persistence.FlushModeType;
+import javax.persistence.LockModeType;
+import javax.persistence.Query;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * AbstractJPASQLQuery is the base class for JPA Native SQL queries
@@ -70,12 +64,13 @@ public abstract class AbstractJPASQLQuery<Q extends AbstractJPASQLQuery<Q>> exte
     @Nullable
 
     protected FactoryExpression<?> projection;
+
     public AbstractJPASQLQuery(EntityManager em, Configuration configuration) {
         this(em, configuration, new DefaultQueryMetadata().noValidate());
     }
 
     public AbstractJPASQLQuery(EntityManager em, Configuration configuration, QueryHandler queryHandler) {
-        this(em, configuration, new DefaultQueryMetadata().noValidate());
+        this(em, configuration, queryHandler, new DefaultQueryMetadata().noValidate());
     }
 
     public AbstractJPASQLQuery(EntityManager em, Configuration configuration, QueryMetadata metadata) {
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/JPASQLQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/JPASQLQuery.java
index d0ce09835..8b1f61101 100644
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/JPASQLQuery.java
+++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/JPASQLQuery.java
@@ -13,14 +13,13 @@
  */
 package com.mysema.query.jpa.sql;
 
-import javax.persistence.EntityManager;
-
-import com.mysema.query.DefaultQueryMetadata;
 import com.mysema.query.QueryMetadata;
 import com.mysema.query.jpa.QueryHandler;
 import com.mysema.query.sql.Configuration;
 import com.mysema.query.sql.SQLTemplates;
 
+import javax.persistence.EntityManager;
+
 /**
  * JPASQLQuery is an SQLQuery implementation that uses JPA Native SQL functionality
  * to execute queries
@@ -39,7 +38,7 @@ public final class JPASQLQuery extends AbstractJPASQLQuery<JPASQLQuery> {
     }
 
     public JPASQLQuery(EntityManager entityManager, Configuration conf, QueryHandler queryHandler) {
-        super(entityManager, conf, new DefaultQueryMetadata().noValidate());
+        super(entityManager, conf, queryHandler);
     }
 
     public JPASQLQuery(EntityManager entityManager, SQLTemplates sqlTemplates, QueryMetadata metadata) {