--- a/ActiveHelp.st	Thu Dec 28 19:17:26 2017 +0100
+++ b/ActiveHelp.st	Tue Jan 09 17:33:30 2018 +0100
@@ -511,24 +511,23 @@
         v := sv
     ].
 
-    (v notNil and:[v respondsTo:#application]) ifTrue:[
-        (app2 := v application) notNil ifTrue:[
+    v notNil ifTrue:[
+        ((v respondsTo:#application) and:[(app2 := v application) notNil]) ifTrue:[
             (app2 ~~ app1) ifTrue:[
                 text := self helpTextFromModel:app2 view:aView at:domainPointOrNil.
                 text notNil ifTrue:[ ^ text ].
             ]
-        ]
-    ].
-    (v notNil and:[v respondsTo:#model]) ifTrue:[
-        (model := v model) notNil ifTrue:[
+        ].
+        ((v respondsTo:#model) and:[(model := v model) notNil]) ifTrue:[
             text := self helpTextFromModel:model view:aView at:domainPointOrNil.
             text notNil ifTrue:[ ^ text ].
-        ]
+        ].
     ].
     ^ nil
 
-    "Modified: / 31.8.1995 / 20:38:00 / claus"
-    "Modified: / 28.7.1998 / 01:47:27 / cg"
+    "Modified: / 31-08-1995 / 20:38:00 / claus"
+    "Modified: / 28-07-1998 / 01:47:27 / cg"
+    "Modified: / 09-01-2018 / 16:46:37 / stefan"
 !
 
 helpTextFromModel:aModelOrTopView view:aView at:aPointOrNil