diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/APTTypeModelFactory.java b/querydsl-apt/src/main/java/com/mysema/query/apt/APTTypeModelFactory.java
index d48a29999..83d2d5e01 100644
--- a/querydsl-apt/src/main/java/com/mysema/query/apt/APTTypeModelFactory.java
+++ b/querydsl-apt/src/main/java/com/mysema/query/apt/APTTypeModelFactory.java
@@ -223,14 +223,14 @@ public class APTTypeModelFactory implements TypeVisitor<TypeModel,Elements> {
         if (t.asElement() != null && t.asElement() instanceof TypeElement){
             TypeElement typeElement = (TypeElement)t.asElement();
             switch(typeElement.getKind()){
+            case ENUM:
             case CLASS: return createClassType(t, typeElement, p);
             case INTERFACE: return createInterfaceType(t, typeElement, p);
-            case ENUM: return create(typeElement, TypeCategory.SIMPLE, p, t.getTypeArguments());
+            default: throw new IllegalArgumentException("Illegal type " + typeElement);
             }            
         }else{
             throw new IllegalArgumentException("Unsupported element type " + t.asElement());
         }
-        return null;
     }
 
     private TypeModel createInterfaceType(DeclaredType t, TypeElement typeElement, Elements p) {
diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/EntityElementVisitor.java b/querydsl-apt/src/main/java/com/mysema/query/apt/EntityElementVisitor.java
index a665b5901..3dddb8de4 100644
--- a/querydsl-apt/src/main/java/com/mysema/query/apt/EntityElementVisitor.java
+++ b/querydsl-apt/src/main/java/com/mysema/query/apt/EntityElementVisitor.java
@@ -185,8 +185,7 @@ public final class EntityElementVisitor extends SimpleElementVisitor6<EntityMode
                 
             }else if (configuration.isBlockedField(field)){
                 blockedProperties.add(name);
-            }
-            
+            }           
             
         }
     }
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/LiteralEntityTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/LiteralEntityTest.java
new file mode 100644
index 000000000..1d2eb79b6
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/mysema/query/domain/LiteralEntityTest.java
@@ -0,0 +1,19 @@
+package com.mysema.query.domain;
+
+import org.junit.Test;
+
+import com.mysema.query.annotations.QueryEntity;
+
+public class LiteralEntityTest {
+    
+    @QueryEntity
+    enum EnumEntity{
+        
+    }
+    
+    @Test
+    public void test(){
+        // TODO
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/RelationTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/RelationTest.java
index 34c4626f8..9e64b44e4 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/RelationTest.java
+++ b/querydsl-apt/src/test/java/com/mysema/query/domain/RelationTest.java
@@ -13,10 +13,10 @@ import org.junit.Test;
 import com.mysema.query.annotations.QueryEntity;
 import com.mysema.query.domain.rel.RelationType2;
 import com.mysema.query.types.path.PCollection;
+import com.mysema.query.types.path.PComparable;
 import com.mysema.query.types.path.PList;
 import com.mysema.query.types.path.PMap;
 import com.mysema.query.types.path.PSet;
-import com.mysema.query.types.path.PSimple;
 
 public class RelationTest extends AbstractTest{
     
@@ -101,7 +101,7 @@ public class RelationTest extends AbstractTest{
     @Test
     public void test() throws SecurityException, NoSuchFieldException{
         cl = QRelationType.class;
-        match(PSimple.class, "enumProperty");
+        match(PComparable.class, "enumProperty");
         match(PList.class, "enumList");
         match(PMap.class, "enumMap1");
         match(PMap.class, "enumMap");