Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v
diff -u -N -r1.239.2.14 -r1.239.2.15
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	4 Jul 2019 17:51:39 -0000	1.239.2.14
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	23 Jul 2019 14:15:00 -0000	1.239.2.15
@@ -1745,7 +1745,7 @@
       #
       # Some (dynammic) pages are volatile, skip these as well
       #
-      if {[info commands $page] ne ""} {
+      if {[nsf::is object $page]} {
         set unresolved [$page references get unresolved]
         if {$unresolved ne ""} {
           #ns_log notice "[$page name] contains unresolved: <$unresolved>"
@@ -2399,7 +2399,7 @@
     #
     # Call a render on the created structure
     #
-    if {[info commands ::__xowiki__MenuBar] ne "" && ${:include_in_foldertree}} {
+    if {[nsf::is object ::__xowiki__MenuBar] && ${:include_in_foldertree}} {
       ::__xowiki__MenuBar additional_sub_menu -kind folder -pages $pages -owner [self]
     }
     #