diff --git a/dexlib/src/main/java/org/jf/dexlib/CodeItem.java b/dexlib/src/main/java/org/jf/dexlib/CodeItem.java
index d3125d80..2954f5f9 100644
--- a/dexlib/src/main/java/org/jf/dexlib/CodeItem.java
+++ b/dexlib/src/main/java/org/jf/dexlib/CodeItem.java
@@ -581,7 +581,9 @@ public class CodeItem extends Item<CodeItem> {
 
             assert debugInstructionFixer.result != null;
 
-            debugInfo.setEncodedDebugInfo(debugInstructionFixer.result);
+            if (debugInstructionFixer.result != null) {
+                debugInfo.setEncodedDebugInfo(debugInstructionFixer.result);
+            }
         }
 
         if (encodedCatchHandlers != null) {