Index: openacs-4/packages/xotcl-core/tcl/context-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/context-procs.tcl,v
diff -u -r1.51 -r1.52
--- openacs-4/packages/xotcl-core/tcl/context-procs.tcl	17 May 2010 09:13:43 -0000	1.51
+++ openacs-4/packages/xotcl-core/tcl/context-procs.tcl	31 May 2010 14:10:48 -0000	1.52
@@ -232,6 +232,12 @@
       # when it tries to detect it, we use the catch and reset it later
       if {[catch {set locale [lang::conn::locale -package_id $package_id]}]} {
         set locale en_US
+      } else {
+        if {[string length $locale] < 5} {
+           ns_log error "[list lang::conn::locale -package_id $package_id] returned invalid locale '$locale' is connected: [ns_conn isconnected] conn_locales [lang::conn::get_accept_language_header]"
+	   ::xo::show_stack
+           set locale en_US
+        }
       }
     } else {
       set locale [lang::system::locale -package_id $package_id]
@@ -262,7 +268,11 @@
       ::xo::cc process_query_parameter
     }
     if {![info exists ::ad_conn(charset)]} {
-      set ::ad_conn(charset) [lang::util::charset_for_locale $locale] 
+      if {[catch {set ::ad_conn(charset) [lang::util::charset_for_locale $locale]} errorMsg]} {
+        ns_log error "Cannot determine charset for locale '$locale'\n$errorMsg\nis connected: [ns_conn isconnected], package_id $package_id"
+	::xo::show_stack
+        set ::ad_conn(charset) UTF-8
+      }
       set ::ad_conn(language) [::xo::cc lang]
       set ::ad_conn(file) ""
     }
@@ -519,4 +529,4 @@
     return $query
   }
 
-}
\ No newline at end of file
+}