Index: openacs-4/packages/xowiki/tcl/xowiki-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-init.tcl,v
diff -u -N -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/xowiki/tcl/xowiki-init.tcl	10 Sep 2015 08:10:40 -0000	1.1.2.2
+++ openacs-4/packages/xowiki/tcl/xowiki-init.tcl	27 Nov 2015 13:24:37 -0000	1.1.2.3
@@ -6,7 +6,7 @@
 # are usable. If we would do thisduring loading, we would have
 # problems with not-yet loaded library files from other packages.
 #
-if {[nsv_exists xowiki must_update_hkeys]} {
+if {[nsv_exists xowiki must_update_hkeys] && [nsv_get xowiki must_update_hkeys]} {
     ::xowiki::hstore::update_update_all_form_instances
     nsv_unset xowiki must_update_hkeys
 }