1 files changed, 4 insertions, 0 deletions

diff --git a/src/main/java/cuchaz/enigma/gui/ClassSelector.java b/src/main/java/cuchaz/enigma/gui/ClassSelector.java
index c6ef0e29..435509e5 100644
--- a/src/main/java/cuchaz/enigma/gui/ClassSelector.java
+++ b/src/main/java/cuchaz/enigma/gui/ClassSelector.java
@@ -181,6 +181,10 @@ public class ClassSelector extends JTree {
             // I can never keep this rule straight when writing these damn things...
             // a < b => -1, a == b => 0, a > b => +1
 
+            if(b == null || a == null){
+                return 0;
+            }
+
             String[] aparts = a.split("/");
             String[] bparts = b.split("/");
             for (int i = 0; true; i++) {