diff --git a/dexlib/src/main/java/org/jf/dexlib/AnnotationDirectoryItem.java b/dexlib/src/main/java/org/jf/dexlib/AnnotationDirectoryItem.java
index 4d157216..02ad386b 100644
--- a/dexlib/src/main/java/org/jf/dexlib/AnnotationDirectoryItem.java
+++ b/dexlib/src/main/java/org/jf/dexlib/AnnotationDirectoryItem.java
@@ -219,40 +219,49 @@ public class AnnotationDirectoryItem extends Item<AnnotationDirectoryItem> {
                 out.annotate(4, "class_annotations_off:");
             }
 
-            out.annotate(4, "annotated_fields_size: 0x" + Integer.toHexString(fieldAnnotations.length) + " (" +
-                    fieldAnnotations.length + ")");
-            out.annotate(4, "annotated_methods_size: 0x" + Integer.toHexString(methodAnnotations.length) + " (" +
-                    methodAnnotations.length + ")");
-            out.annotate(4, "annotated_parameters_size: 0x" + Integer.toHexString(parameterAnnotations.length) + " (" +
-                    parameterAnnotations.length + ")");
+            int length = fieldAnnotations==null?0:fieldAnnotations.length;
+            out.annotate(4, "annotated_fields_size: 0x" + Integer.toHexString(length) + " (" +
+                    length + ")");
+            length = methodAnnotations==null?0:methodAnnotations.length;
+            out.annotate(4, "annotated_methods_size: 0x" + Integer.toHexString(length) + " (" +
+                    length + ")");
+            length = parameterAnnotations==null?0:parameterAnnotations.length;
+            out.annotate(4, "annotated_parameters_size: 0x" + Integer.toHexString(length) + " (" +
+                    length + ")");
 
+            int index;
+            if (fieldAnnotations != null) {
+               index = 0;
+                for (int i=0; i<fieldAnnotations.length; i++) {
+                    out.annotate(0, "[" + index++ + "] field_annotation");
 
-            int index = 0;
-            for (int i=0; i<fieldAnnotations.length; i++) {
-                out.annotate(0, "[" + index++ + "] field_annotation");
-
-                out.indent();
-                out.annotate(4, "field: " + fieldAnnotationFields[i].getFieldName().getStringValue() + ":" +
-                        fieldAnnotationFields[i].getFieldType().getTypeDescriptor());
-                out.annotate(4, "annotations_off: 0x" + Integer.toHexString(fieldAnnotations[i].getOffset()));
-                out.deindent();
+                    out.indent();
+                    out.annotate(4, "field: " + fieldAnnotationFields[i].getFieldName().getStringValue() + ":" +
+                            fieldAnnotationFields[i].getFieldType().getTypeDescriptor());
+                    out.annotate(4, "annotations_off: 0x" + Integer.toHexString(fieldAnnotations[i].getOffset()));
+                    out.deindent();
+                }
             }
 
-            index = 0;
-            for (int i=0; i<methodAnnotations.length; i++) {
-                out.annotate(0, "[" + index++ + "] method_annotation");
-                out.indent();
-                out.annotate(4, "method: " + methodAnnotationMethods[i].getMethodString());
-                out.annotate(4, "annotations_off: 0x" + Integer.toHexString(methodAnnotations[i].getOffset()));
-                out.deindent();
+            if (methodAnnotations != null) {
+                index = 0;
+                for (int i=0; i<methodAnnotations.length; i++) {
+                    out.annotate(0, "[" + index++ + "] method_annotation");
+                    out.indent();
+                    out.annotate(4, "method: " + methodAnnotationMethods[i].getMethodString());
+                    out.annotate(4, "annotations_off: 0x" + Integer.toHexString(methodAnnotations[i].getOffset()));
+                    out.deindent();
+                }
             }
 
-            index = 0;
-            for (int i=0; i<parameterAnnotations.length; i++) {
-                out.annotate(0, "[" + index++ + "] parameter_annotation");
-                out.indent();
-                out.annotate(4, "method: " + parameterAnnotationMethods[i].getMethodString());
-                out.annotate(4, "annotations_off: 0x" + Integer.toHexString(parameterAnnotations[i].getOffset()));
+            if (parameterAnnotations != null) {
+                index = 0;
+                for (int i=0; i<parameterAnnotations.length; i++) {
+                    out.annotate(0, "[" + index++ + "] parameter_annotation");
+                    out.indent();
+                    out.annotate(4, "method: " + parameterAnnotationMethods[i].getMethodString());
+                    out.annotate(4, "annotations_off: 0x" + Integer.toHexString(parameterAnnotations[i].getOffset()));
+                }
             }
         }