1 files changed, 10 insertions, 7 deletions

diff --git a/src/cuchaz/enigma/analysis/SourceIndexBehaviorVisitor.java b/src/cuchaz/enigma/analysis/SourceIndexBehaviorVisitor.java
index a1dac4b..6238b1e 100644
--- a/src/cuchaz/enigma/analysis/SourceIndexBehaviorVisitor.java
+++ b/src/cuchaz/enigma/analysis/SourceIndexBehaviorVisitor.java
@@ -177,14 +177,17 @@ public class SourceIndexBehaviorVisitor extends SourceIndexVisitor
         public Void visitObjectCreationExpression( ObjectCreationExpression node, SourceIndex index )
         {
                 MemberReference ref = node.getUserData( Keys.MEMBER_REFERENCE );
-                ClassEntry classEntry = new ClassEntry( ref.getDeclaringType().getInternalName() );
-                ConstructorEntry constructorEntry = new ConstructorEntry( classEntry, ref.getSignature() );
-                if( node.getType() instanceof SimpleType )
+                if( ref != null )
                 {
-                        index.addReference(
-                                ((SimpleType)node.getType()).getIdentifierToken(),
-                                new EntryReference<Entry,Entry>( constructorEntry, m_behaviorEntry )
-                        );
+                        ClassEntry classEntry = new ClassEntry( ref.getDeclaringType().getInternalName() );
+                        ConstructorEntry constructorEntry = new ConstructorEntry( classEntry, ref.getSignature() );
+                        if( node.getType() instanceof SimpleType )
+                        {
+                                index.addReference(
+                                        ((SimpleType)node.getType()).getIdentifierToken(),
+                                        new EntryReference<Entry,Entry>( constructorEntry, m_behaviorEntry )
+                                );
+                        }
                 }
                 
                 return recurse( node, index );