diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/ClassDefinition.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/ClassDefinition.java
index e5194c6a..8ed90afb 100644
--- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/ClassDefinition.java
+++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/ClassDefinition.java
@@ -104,11 +104,8 @@ public class ClassDefinition {
         }
 
         for (ClassDataItem.EncodedMethod directMethod: classDataItem.getDirectMethods()) {
-            if (directMethod.method.getMethodName().getStringValue().equals("<clinit>")) {
-                if (directMethod.codeItem == null) {
-                    break;
-                }
-
+            if (directMethod.method.getMethodName().getStringValue().equals("<clinit>") &&
+                    directMethod.codeItem != null) {
                 for (Instruction instruction: directMethod.codeItem.getInstructions()) {
                     switch (instruction.opcode) {
                         case SPUT: