--- /usr/bin/indicator-weather	2013-10-01 01:53:59.922633000 -0400
+++ /usr/bin/indicator-weather	2013-10-01 23:43:35.624593015 -0400
@@ -2601,2 +2601,3 @@ class ExtendedForecast(Gtk.Window):
-        # TODO: catch KeyError in case there is no weather-com id present
-        forecast = Forecast(wi.metric_system,
+        try:
+            # try with weather.com id first
+            forecast = Forecast(wi.metric_system,
@@ -2603,0 +2605,5 @@ class ExtendedForecast(Gtk.Window):
+                            locale_name)
+        except KeyError:
+            # no weather.com id, use yahoo id
+            forecast = Forecast(wi.metric_system,
+                            wi.current_location.location_details['yahoo id'],