Index: openacs-4/packages/ams/tcl/address-widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/tcl/address-widget-procs.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/ams/tcl/address-widget-procs.tcl	21 May 2006 00:46:57 -0000	1.16
+++ openacs-4/packages/ams/tcl/address-widget-procs.tcl	20 Jun 2006 16:51:28 -0000	1.17
@@ -171,9 +171,9 @@
             set country [string toupper $country]
             lappend country_code [list [lang::message::lookup $locale "ref-countries.${country}"] $country]
         }
-        set country_code [concat $country_code [list "--" ""] $return_country_list]
+        set country_code [concat $country_code [list [list "--" ""]] $return_country_list]
     } else {
-        set country_code $return_country_list
+        set country_code [concat [list [list "" ""]] $return_country_list]
     }
     return $country_code
 }
@@ -231,6 +231,9 @@
 	lappend message "[_ ams.Your_delivery_address_is_too_many_lines]"
     }
 
+    if { $country_code eq "" } {
+	lappend message "[_ ams.country] is required."
+    }
 
     # Country Specific Validation
     switch $country_code {