Merge branch 'rails-3-develop' of ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop

1 files changed, 8 insertions, 4 deletions

diff --git a/app/models/holiday_import.rb b/app/models/holiday_import.rb
index c6019fac0..98a9b96fc 100644
--- a/app/models/holiday_import.rb
+++ b/app/models/holiday_import.rb
@@ -84,10 +84,14 @@ class HolidayImport
     end
 
     def populate_from_suggestions
-        holiday_info = Holidays.between(start_date, end_date, @country_code.to_sym, :observed)
-        holiday_info.each do |holiday_info_hash|
-            holidays << Holiday.new(:description => holiday_info_hash[:name],
-                                    :day => holiday_info_hash[:date])
+        begin
+            holiday_info = Holidays.between(start_date, end_date, @country_code.to_sym, :observed)
+            holiday_info.each do |holiday_info_hash|
+                holidays << Holiday.new(:description => holiday_info_hash[:name],
+                                        :day => holiday_info_hash[:date])
+            end
+        rescue Holidays::UnknownRegionError
+            []
         end
     end
 end