--- a/Tools_NavigationState.st	Sun Dec 08 04:27:36 2013 +0000
+++ b/Tools_NavigationState.st	Thu Dec 12 12:01:05 2013 +0100
@@ -144,8 +144,12 @@
 codeAspect:aSymbolOrNil
     "set the codeAspect; a symbol describing what is shown in the codeView"
 
+    |cv|
+
     codeAspect := aSymbolOrNil.
-    codeView codeAspect: aSymbolOrNil
+    (cv := self codeView) notNil ifTrue:[
+        cv codeAspect: aSymbolOrNil
+    ].
 
     "Created: / 11-02-2000 / 12:43:45 / cg"
     "Modified: / 27-09-2013 / 09:59:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -1690,14 +1694,14 @@
 !NavigationState class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools_NavigationState.st,v 1.52 2013-09-27 09:30:01 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools_NavigationState.st,v 1.53 2013-12-12 11:01:05 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools_NavigationState.st,v 1.52 2013-09-27 09:30:01 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools_NavigationState.st,v 1.53 2013-12-12 11:01:05 cg Exp $'
 !
 
 version_SVN
-    ^ '$Id: Tools_NavigationState.st,v 1.52 2013-09-27 09:30:01 vrany Exp $'
+    ^ '$Id: Tools_NavigationState.st,v 1.53 2013-12-12 11:01:05 cg Exp $'
 ! !