--- a/ContextInspectorView.st	Fri May 06 06:55:08 2016 +0200
+++ b/ContextInspectorView.st	Mon May 09 21:47:57 2016 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1993 by Claus Gittinger
 	      All Rights Reserved
@@ -641,12 +639,15 @@
         ]
 
     ].
+    
     varIdx > values size ifTrue:[
         |wsIndex|
 
-        wsIndex := varIdx - values size - 1.
-        wsIndex <= workspaceVariableNamesInDoIts size ifTrue:[
-            ^ Workspace workspaceVariableAt:(workspaceVariableNamesInDoIts at:wsIndex).
+        workspaceVariableNamesInDoIts notNil ifTrue:[
+            wsIndex := varIdx - values size - 1.
+            wsIndex <= workspaceVariableNamesInDoIts size ifTrue:[
+                ^ Workspace workspaceVariableAt:(workspaceVariableNamesInDoIts at:wsIndex).
+            ].
         ].
         ^ '** oops - could not find value **'
     ].
@@ -749,10 +750,10 @@
 !ContextInspectorView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/ContextInspectorView.st,v 1.98 2015-04-22 17:50:00 stefan Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/ContextInspectorView.st,v 1.98 2015-04-22 17:50:00 stefan Exp $'
+    ^ '$Header$'
 ! !