diff --git a/pom.xml b/pom.xml
index 473e071b7..55f47fc68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.mysema.codegen</groupId>
   <artifactId>codegen</artifactId>
-  <version>0.3.9-SNAPSHOT</version>
+  <version>0.4.0</version>
   <name>Codegen</name>
   <description>Code generation and compilation for Java</description>
   <parent>
diff --git a/src/main/java/com/mysema/codegen/model/TypeExtends.java b/src/main/java/com/mysema/codegen/model/TypeExtends.java
index 97ee31cd4..073635e30 100644
--- a/src/main/java/com/mysema/codegen/model/TypeExtends.java
+++ b/src/main/java/com/mysema/codegen/model/TypeExtends.java
@@ -12,6 +12,8 @@ import javax.annotation.Nullable;
 
 import net.jcip.annotations.Immutable;
 
+import org.apache.commons.lang.StringUtils;
+
 /**
  * @author tiwe
  *
@@ -43,7 +45,8 @@ public class TypeExtends extends TypeAdapter{
             if (type.equals(Types.OBJECT)){
                 return "?";
             }else{
-                return "? extends " + super.getGenericName(true, packages, classes);
+                String genericName = super.getGenericName(true, packages, classes);
+                return StringUtils.isEmpty(genericName) ? "?" : "? extends " + genericName;
             }
         }else{
             return super.getGenericName(asArgType, packages, classes);