=== modified file 'debian/changelog'
--- old/debian/changelog	2009-09-25 14:17:17 +0000
+++ new/debian/changelog	2009-10-20 15:23:52 +0000
@@ -1,3 +1,10 @@
+ec2-init (0.4.999-0ubuntu4) karmic; urgency=low
+
+  * set locale to en_US.UTF-8 if get_location_from_availability_zone 
+    doesn't have a match (LP: #407949)
+
+ -- Scott Moser <smoser@ubuntu.com>  Tue, 20 Oct 2009 09:57:49 -0400
+
 ec2-init (0.4.999-0ubuntu3) karmic; urgency=low
 
   * split running of user-data out of ec2-init into ec2-init-user-data

=== modified file 'ec2-set-defaults.py'
--- old/ec2-set-defaults.py	2009-08-26 01:23:52 +0000
+++ new/ec2-set-defaults.py	2009-10-20 17:02:59 +0000
@@ -28,10 +28,16 @@
     ec2 = ec2init.EC2Init()
 
     availability_zone = ec2.get_availability_zone()
-    location          = ec2.get_location_from_availability_zone(availability_zone)
-    mirror            = ec2.get_mirror_from_availability_zone(availability_zone)
-
-    locale = ec2.location_locale_map[location]
+
+    try:
+        location = ec2.get_location_from_availability_zone(availability_zone)
+        locale = ec2.location_locale_map[location]
+    except Exception, e:
+        locale = "en_US.UTF-8"
+
+    # get_mirror_from_availability_zone returns default on no match
+    mirror = ec2.get_mirror_from_availability_zone(availability_zone)
+
     apply_locale(locale)
 
     generate_sources_list(mirror)