Index: openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl,v
diff -u -r1.48.2.6 -r1.48.2.7
--- openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl	11 Nov 2016 00:09:20 -0000	1.48.2.6
+++ openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl	23 Feb 2017 10:37:14 -0000	1.48.2.7
@@ -160,7 +160,7 @@
     if { [file exists $catalog_file_path] } {
         set catalog_file_contents [lang::catalog::read_file $catalog_file_path]
         array set catalog_array [lang::catalog::parse $catalog_file_contents]            
-        array set messages_array [lindex [array get catalog_array messages] 1]            
+        array set messages_array $catalog_array(messages)
     } else {
         array set messages_array {}
     }
@@ -223,12 +223,11 @@
             set key_comp_counter "0"
             set unique_key $message_key
             while { 1 } {
-                set existing_text [lindex [array get messages_array $unique_key] 1]
 
-                if { $existing_text ne "" } {
+                if { [info exists messages_array($unique_key)] } {
                     # The key already exists
-
-                    if {$existing_text eq $new_text} {
+                    
+                    if {$messages_array($unique_key) eq $new_text} {
                         # New and old texts are identical - don't add the key
                         ns_log Notice [list lang::util::replace_temporary_tags_with_lookups - \
                                        message key $unique_key already exists in catalog \