Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl,v
diff -u -N -r1.109.2.2 -r1.109.2.3
--- openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl	2 Sep 2015 09:41:06 -0000	1.109.2.2
+++ openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl	6 Sep 2015 09:14:52 -0000	1.109.2.3
@@ -1629,7 +1629,7 @@
                 $spec_file
 
         } errmsg] } {
-                        apm_callback_and_log -severity Error $callback "<p><font color=red>[string totitle $package_key] not installed.</font>
+            apm_callback_and_log -severity Error $callback "<p><font color=red>[string totitle $package_key] not installed.</font>
 <p> Error:
 <pre><blockquote>[ad_quotehtml $errmsg]</blockquote><blockquote>[ad_quotehtml $::errorInfo]</blockquote></pre>"
         } 
@@ -2487,7 +2487,12 @@
         set maturity_key(3) "#acs-tcl.maturity_mature_and_standard#"
         set maturity_key(4) "#acs-tcl.maturity_deprecated#"
 
-        set result [lang::util::localize $maturity_key($maturity)]
+        if {[catch {
+            set result [lang::util::localize $maturity_key($maturity)]
+        } errorMsg]} {
+            ns_log warning "Couldn't localize maturity key $maturity: $errorMsg"
+            set result $maturity
+        }
 
     } else {
 
Index: openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl,v
diff -u -N -r1.93.2.1 -r1.93.2.2
--- openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl	20 Aug 2015 10:57:13 -0000	1.93.2.1
+++ openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl	6 Sep 2015 09:14:52 -0000	1.93.2.2
@@ -65,8 +65,8 @@
 # oracle, the implementation does not distinguish btw. AOLserver and
 # NaviServer (uses simply ns_cache_eval for speed and simplicity).
 #
-if {[info command ::nx::Object] ne "" 
-    && [apm_package_version_count xotcl-core] > 0
+if {[info command ::nx::Object] ne ""
+    && [info commands bootstrap::xo::dc] ne ""
     && [db_driverkey ""] ne "oracle"
     && [ns_info name] eq "NaviServer"
 } {