diff --git a/src/main/java/com/mysema/codegen/model/ClassType.java b/src/main/java/com/mysema/codegen/model/ClassType.java
index 8be21f914..bdc553f7a 100644
--- a/src/main/java/com/mysema/codegen/model/ClassType.java
+++ b/src/main/java/com/mysema/codegen/model/ClassType.java
@@ -34,6 +34,7 @@ public class ClassType implements Type {
     @Nullable
     private final Class<?> primitiveClass;
     
+    @Nullable
     private Type arrayType, componentType;
 
     public ClassType(Class<?> javaClass, Type... parameters) {
diff --git a/src/main/java/com/mysema/codegen/model/SimpleType.java b/src/main/java/com/mysema/codegen/model/SimpleType.java
index e19de05ad..408c3ccb7 100644
--- a/src/main/java/com/mysema/codegen/model/SimpleType.java
+++ b/src/main/java/com/mysema/codegen/model/SimpleType.java
@@ -10,6 +10,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
+import javax.annotation.Nullable;
+
 import net.jcip.annotations.Immutable;
 
 
@@ -27,6 +29,7 @@ public class SimpleType implements Type {
     
     private final boolean primitiveClass, finalClass;
     
+    @Nullable
     private Type arrayType, componentType;
 
     public SimpleType(String fullName, String packageName, String simpleName, Type... parameters) {