2 files changed, 10 insertions, 1 deletions

diff --git a/src/cuchaz/enigma/analysis/JarIndex.java b/src/cuchaz/enigma/analysis/JarIndex.java
index 4279dedd..fc19e7bc 100644
--- a/src/cuchaz/enigma/analysis/JarIndex.java
+++ b/src/cuchaz/enigma/analysis/JarIndex.java
@@ -663,7 +663,11 @@ public class JarIndex
                 }
                 
                 // look at interface methods too
-                getRelatedMethodImplementations( methodEntries, getMethodImplementations( null, methodEntry ) );
+                MethodImplementationsTreeNode implementations = getMethodImplementations( null, methodEntry );
+                if( implementations != null )
+                {
+                        getRelatedMethodImplementations( methodEntries, implementations );
+                }
                 
                 // recurse
                 for( int i=0; i<node.getChildCount(); i++ )
diff --git a/src/cuchaz/enigma/analysis/MethodImplementationsTreeNode.java b/src/cuchaz/enigma/analysis/MethodImplementationsTreeNode.java
index b529f3f6..b7434e84 100644
--- a/src/cuchaz/enigma/analysis/MethodImplementationsTreeNode.java
+++ b/src/cuchaz/enigma/analysis/MethodImplementationsTreeNode.java
@@ -29,6 +29,11 @@ public class MethodImplementationsTreeNode extends DefaultMutableTreeNode
         
         public MethodImplementationsTreeNode( Translator deobfuscatingTranslator, MethodEntry entry )
         {
+                if( entry == null )
+                {
+                        throw new IllegalArgumentException( "entry cannot be null!" );
+                }
+                
                 m_deobfuscatingTranslator = deobfuscatingTranslator;
                 m_entry = entry;
         }