--- a/BrowserView.st	Fri Feb 22 09:54:35 2019 +0100
+++ b/BrowserView.st	Fri Feb 22 11:18:58 2019 +0100
@@ -7892,7 +7892,7 @@
     styleSheet isWindowsStyle ifTrue:[frame rightInset:1].
     self createClassListViewIn:frame.
 
-    (environment isNil or:[environment hasNameSpaces]) ifTrue:[
+    (environment isNil or:[environment isNameSpace and:[ environment hasNameSpaces]]) ifTrue:[
         namespaceList := ComboListView origin:(0.0@1.0) corner:(0.25@1.0) in:hpanel.
 
         hMax := (instanceToggle height + instanceToggle borderWidth)
@@ -7945,7 +7945,8 @@
 
     self createCodeViewIn:vpanel atY:topFraction
 
-    "Modified: / 11.10.2001 / 21:20:21 / cg"
+    "Modified: / 11-10-2001 / 21:20:21 / cg"
+    "Modified: / 22-02-2019 / 10:10:58 / Claus Gittinger"
 !
 
 setupForClass:aClass
@@ -12476,7 +12477,12 @@
 environment:anEnvironment
     "allows me to browse something different from Smalltalk (a SnapShotImage for example)"
 
-    environment := anEnvironment
+    self assert:(anEnvironment isNameSpace).
+    anEnvironment isNameSpace ifTrue:[
+        environment := anEnvironment
+    ].
+
+    "Modified: / 22-02-2019 / 10:13:11 / Claus Gittinger"
 !
 
 extractClassAndSelectorFromSelectionInto:aBlock