--- a/Tools__ClassList.st	Fri Mar 27 16:53:13 2015 +0100
+++ b/Tools__ClassList.st	Fri Mar 27 17:19:41 2015 +0100
@@ -1964,7 +1964,7 @@
 !
 
 nameListEntryFor:aClass withNameSpace:useFullName
-    |sortByNameAndInheritanceValue nm indent owner orgMode indentString javaPackage|
+    |sortByNameAndInheritanceValue nm indent owner orgMode indentString |
 
     aClass == (self class nameListEntryForALL) ifTrue:[ ^ aClass ].
 
@@ -2008,16 +2008,20 @@
     ].
 
     aClass isJavaClass ifTrue:[
+        | package javaPackage |
         "/ only show the last name, unless multiple packages are shown in the list
-        javaPackage := aClass package.
-        (self classList value contains:[:cls | cls package ~= javaPackage]) ifFalse:[
-            | i |
+        package := aClass package.
+        javaPackage := aClass javaPackage.
+        javaPackage notEmptyOrNil ifTrue:[
+            (self classList value contains:[:cls | cls package ~= package]) ifFalse:[ 
+                | i |
 
-            i := nm string indexOfNonSeparator.
-            nm := nm copyFrom: i + (aClass javaPackage size + 1).     
-            i > 0 ifTrue:[ 
-                nm := (String new: i - 1) , nm
-            ].
+                i := nm string indexOfNonSeparator.
+                nm := nm copyFrom: i + (javaPackage size + 1).     
+                i > 0 ifTrue:[ 
+                    nm := (String new: i - 1) , nm
+                ].
+            ]
         ].
         ^ nm
     ].
@@ -2053,7 +2057,7 @@
     ^ nm
 
     "Modified: / 04-07-2011 / 19:00:45 / cg"
-    "Modified: / 25-02-2015 / 16:18:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 27-03-2015 / 16:23:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 nameListIndentStringFor:aClass withNameSpace:useFullName
@@ -2138,10 +2142,10 @@
 !ClassList class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__ClassList.st,v 1.92 2015-02-25 15:25:07 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__ClassList.st,v 1.93 2015-03-27 16:19:41 vrany Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__ClassList.st,v 1.92 2015-02-25 15:25:07 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__ClassList.st,v 1.93 2015-03-27 16:19:41 vrany Exp $'
 ! !