2 files changed, 17 insertions, 8 deletions

diff --git a/src/cuchaz/enigma/analysis/JarIndex.java b/src/cuchaz/enigma/analysis/JarIndex.java
index a8ac0013..b4096e9d 100644
--- a/src/cuchaz/enigma/analysis/JarIndex.java
+++ b/src/cuchaz/enigma/analysis/JarIndex.java
@@ -587,9 +587,14 @@ public class JarIndex
         
         public ClassImplementationsTreeNode getClassImplementations( Translator deobfuscatingTranslator, ClassEntry obfClassEntry )
         {
-                ClassImplementationsTreeNode node = new ClassImplementationsTreeNode( deobfuscatingTranslator, obfClassEntry );
-                node.load( this );
-                return node;
+                // is this even an interface?
+                if( isInterface( obfClassEntry.getClassName() ) )
+                {
+                        ClassImplementationsTreeNode node = new ClassImplementationsTreeNode( deobfuscatingTranslator, obfClassEntry );
+                        node.load( this );
+                        return node;
+                }
+                return null;
         }
         
         public MethodInheritanceTreeNode getMethodInheritance( Translator deobfuscatingTranslator, MethodEntry obfMethodEntry )
diff --git a/src/cuchaz/enigma/convert/ClassIdentity.java b/src/cuchaz/enigma/convert/ClassIdentity.java
index bd2824b3..b3b043e5 100644
--- a/src/cuchaz/enigma/convert/ClassIdentity.java
+++ b/src/cuchaz/enigma/convert/ClassIdentity.java
@@ -111,12 +111,16 @@ public class ClassIdentity
                 // stuff from the jar index
                 
                 m_implementations = HashMultiset.create();
-                @SuppressWarnings( "unchecked" )
-                Enumeration<ClassImplementationsTreeNode> implementations = index.getClassImplementations( null, m_classEntry ).children();
-                while( implementations.hasMoreElements() )
+                ClassImplementationsTreeNode implementationsNode = index.getClassImplementations( null, m_classEntry );
+                if( implementationsNode != null )
                 {
-                        ClassImplementationsTreeNode node = implementations.nextElement();
-                        m_implementations.add( scrubClassName( node.getClassEntry().getName() ) );
+                        @SuppressWarnings( "unchecked" )
+                        Enumeration<ClassImplementationsTreeNode> implementations = implementationsNode.children();
+                        while( implementations.hasMoreElements() )
+                        {
+                                ClassImplementationsTreeNode node = implementations.nextElement();
+                                m_implementations.add( scrubClassName( node.getClassEntry().getName() ) );
+                        }
                 }
                 
                 m_references = HashMultiset.create();