--- a/Tools__MethodList.st	Sat Jan 14 15:20:57 2017 +0100
+++ b/Tools__MethodList.st	Mon Jan 16 19:49:43 2017 +0100
@@ -379,7 +379,7 @@
             something == #classDefinition ifTrue:[
                 cls := aParameter.
                 clsName := cls name.
-                (classes contains:[:aClass | aClass name = clsName]) ifFalse:[
+                (classes contains:[:aClass | aClass notNil and:[aClass name = clsName]]) ifFalse:[
                     ^ self   "/ I don't care for that class
                 ].
                 classes := classes collect:[:eachClass | (environment classNamed:eachClass name) ].
@@ -1654,7 +1654,7 @@
         ^ selector withColor:Color red.
     ].
 
-    showClassFirst ifTrue:[
+    (showClassFirst and:[cls notNil]) ifTrue:[        
         s := aMethod printStringForBrowserWithSelector:selector allBold inClass:cls.
         s := cls nameInBrowser , ' ' , s
     ] ifFalse:[
@@ -1729,7 +1729,7 @@
             ].
         ].
     ].
-    icn isNil ifTrue:[
+    (icn isNil and:[cls notNil]) ifTrue:[
         "/ (selector isSymbol and:[selector startsWith:'test']) ifTrue:[
         (((cls isSubclassOf:TestCase) and:[cls isAbstract not])
         or:[showSyntheticMethods value and:[aMethod isSynthetic]]) ifTrue:[