Weather plugin fixups

1 files changed, 4 insertions, 0 deletions

diff --git a/data/rbot/plugins/weather.rb b/data/rbot/plugins/weather.rb
index 7a48ef23..036fbbdd 100644
--- a/data/rbot/plugins/weather.rb
+++ b/data/rbot/plugins/weather.rb
@@ -112,6 +112,7 @@ class WeatherPlugin < Plugin
     if loc.empty?
       debug "No weather location found for #{m.sourcenick}"
       m.reply "I don't know where you are yet, #{m.sourcenick}. See 'help weather nws' or 'help weather wu' for additional help"
+      return
     end
     case service
     when :nws
@@ -149,6 +150,9 @@ class WeatherPlugin < Plugin
       when nil
         m.reply "couldn't retrieve weather information, sorry"
         return
+      when /Search not found:/
+        m.reply "no such station found (#{where})"
+        return
       when /<table border.*?>(.*?)<\/table>/m
         data = $1
         m.reply wu_weather_filter(data)