diff --git a/src/main/java/com/mysema/codegen/model/SimpleType.java b/src/main/java/com/mysema/codegen/model/SimpleType.java
index a482ceb..09df53f 100644
--- a/src/main/java/com/mysema/codegen/model/SimpleType.java
+++ b/src/main/java/com/mysema/codegen/model/SimpleType.java
@@ -72,7 +72,7 @@ public SimpleType(TypeCategory category, String fullName, String packageName,
         this.fullName = fullName;
         this.packageName = packageName;
         this.simpleName = simpleName;
-        if (packageName.length() > 0) {
+        if (packageName.length() > 0 && fullName.length() > packageName.length()) {
             this.localName = fullName.substring(packageName.length() + 1);
         } else {
             this.localName = fullName;
@@ -126,7 +126,8 @@ public boolean equals(Object o) {
         }
     }
 
-    public TypeCategory getCategory() {
+    @Override
+	public TypeCategory getCategory() {
         return category;
     }