diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/ExternalEntityTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/ExternalEntityTest.java
new file mode 100644
index 000000000..9272e1ae2
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/mysema/query/domain/ExternalEntityTest.java
@@ -0,0 +1,16 @@
+package com.mysema.query.domain;
+
+import org.junit.Ignore;
+
+import com.mysema.query.annotations.QueryEntity;
+import com.mysema.query.codegen.sub.AbstractEntity;
+
+@Ignore
+public class ExternalEntityTest {
+
+    @QueryEntity
+    public class MyEntity extends AbstractEntity<MyEntity> {
+        
+    }
+    
+}
diff --git a/querydsl-core/src/main/java/com/mysema/query/codegen/TypeResolver.java b/querydsl-core/src/main/java/com/mysema/query/codegen/TypeResolver.java
index 490ee03de..c0199cdca 100644
--- a/querydsl-core/src/main/java/com/mysema/query/codegen/TypeResolver.java
+++ b/querydsl-core/src/main/java/com/mysema/query/codegen/TypeResolver.java
@@ -48,7 +48,7 @@ public final class TypeResolver {
             }
         }
 
-        if (index > -1 && subtype.getSuperType() != null){
+        if (index > -1){
             // get binding of var via model supertype
             Supertype type = subtype.getSuperType();
             while (!type.getType().equals(declaringType)){
diff --git a/querydsl-core/src/test/java/com/mysema/query/codegen/sub/AbstractEntity.java b/querydsl-core/src/test/java/com/mysema/query/codegen/sub/AbstractEntity.java
new file mode 100644
index 000000000..ed0bec8fb
--- /dev/null
+++ b/querydsl-core/src/test/java/com/mysema/query/codegen/sub/AbstractEntity.java
@@ -0,0 +1,5 @@
+package com.mysema.query.codegen.sub;
+
+public class AbstractEntity<T> {
+
+}