diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/CodeItem.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/CodeItem.java
index e0841090..378c94b4 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/CodeItem.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/CodeItem.java
@@ -366,19 +366,21 @@ public class CodeItem {
                 out.annotate(2, instruction.getOpcode().name);
                 out.indent();
                 out.annotate(2, "size = %d", elements.size());
-                out.annotate(0, "keys:");
-                out.indent();
-                for (int i=0; i<elements.size(); i++) {
-                    out.annotate(4, "key[%d] = %d", i, elements.get(i).getKey());
+                if (elements.size() > 0) {
+                    out.annotate(0, "keys:");
+                    out.indent();
+                    for (int i=0; i<elements.size(); i++) {
+                        out.annotate(4, "key[%d] = %d", i, elements.get(i).getKey());
+                    }
+                    out.deindent();
+                    out.annotate(0, "targets:");
+                    out.indent();
+                    for (int i=0; i<elements.size(); i++) {
+                        out.annotate(4, "target[%d] = %d", i, elements.get(i).getOffset());
+                    }
+                    out.deindent();
                 }
                 out.deindent();
-                out.annotate(0, "targets:");
-                out.indent();
-                for (int i=0; i<elements.size(); i++) {
-                    out.annotate(4, "target[%d] = %d", i, elements.get(i).getOffset());
-                }
-                out.deindent();
-                out.deindent();
             }
 
             private void addDebugInfoIdentity(int debugInfoOffset, String methodString) {