--- a/Tools_NavigationState.st	Fri Mar 17 15:17:40 2006 +0100
+++ b/Tools_NavigationState.st	Fri Mar 17 15:17:46 2006 +0100
@@ -243,6 +243,8 @@
 applicationOfComponent:aComponentName or:anotherComponentName
     |builder view|
 
+    canvas isNil ifTrue:[^ nil].
+
     builder := canvas builder.
 
     view := builder findVisibleComponentAt:aComponentName.
@@ -1247,5 +1249,5 @@
 !NavigationState class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools_NavigationState.st,v 1.17 2006-03-13 11:31:15 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools_NavigationState.st,v 1.18 2006-03-17 14:17:46 cg Exp $'
 ! !