diff --git a/dexlib2/src/main/java/org/jf/dexlib2/writer/builder/BuilderTypeListPool.java b/dexlib2/src/main/java/org/jf/dexlib2/writer/builder/BuilderTypeListPool.java
index f8818f7e..7b189fdb 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/writer/builder/BuilderTypeListPool.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/writer/builder/BuilderTypeListPool.java
@@ -55,7 +55,7 @@ class BuilderTypeListPool implements TypeListSection<BuilderTypeReference, Build
     }
 
     @Nonnull public BuilderTypeList internTypeList(@Nullable List<? extends CharSequence> types) {
-        if (types == null) {
+        if (types == null || types.size() == 0) {
             return BuilderTypeList.EMPTY;
         }
 
@@ -76,7 +76,7 @@ class BuilderTypeListPool implements TypeListSection<BuilderTypeReference, Build
     }
 
     @Override public int getNullableItemOffset(@Nullable BuilderTypeList key) {
-        return key==null?DexWriter.NO_OFFSET:key.offset;
+        return (key==null||key.size()==0)?DexWriter.NO_OFFSET:key.offset;
     }
 
     @Nonnull @Override
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/writer/pool/TypeListPool.java b/dexlib2/src/main/java/org/jf/dexlib2/writer/pool/TypeListPool.java
index 50ffcb81..7e0fbe03 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/writer/pool/TypeListPool.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/writer/pool/TypeListPool.java
@@ -32,10 +32,12 @@
 package org.jf.dexlib2.writer.pool;
 
 import com.google.common.collect.ImmutableList;
-import org.jf.dexlib2.writer.pool.TypeListPool.Key;
+import org.jf.dexlib2.writer.DexWriter;
 import org.jf.dexlib2.writer.TypeListSection;
+import org.jf.dexlib2.writer.pool.TypeListPool.Key;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.util.Collection;
 import java.util.Iterator;
 
@@ -48,11 +50,13 @@ public class TypeListPool extends BaseNullableOffsetPool<Key<? extends Collectio
     }
 
     public void intern(@Nonnull Collection<? extends CharSequence> types) {
-        Key<? extends Collection<? extends CharSequence>> key = new Key<Collection<? extends CharSequence>>(types);
-        Integer prev = internedItems.put(key, 0);
-        if (prev == null) {
-            for (CharSequence type: types) {
-                typePool.intern(type);
+        if (types.size() > 0) {
+            Key<? extends Collection<? extends CharSequence>> key = new Key<Collection<? extends CharSequence>>(types);
+            Integer prev = internedItems.put(key, 0);
+            if (prev == null) {
+                for (CharSequence type: types) {
+                    typePool.intern(type);
+                }
             }
         }
     }
@@ -65,6 +69,14 @@ public class TypeListPool extends BaseNullableOffsetPool<Key<? extends Collectio
         return typesKey.types;
     }
 
+    @Override public int getNullableItemOffset(@Nullable Key<? extends Collection<? extends CharSequence>> key) {
+        if (key == null || key.types.size() == 0) {
+            return DexWriter.NO_OFFSET;
+        } else {
+            return super.getNullableItemOffset(key);
+        }
+    }
+
     public static class Key<TypeCollection extends Collection<? extends CharSequence>>
             implements Comparable<Key<? extends Collection<? extends CharSequence>>> {
         @Nonnull TypeCollection types;