diff --git a/ChangeLog b/ChangeLog
index 4a360fe24f..92ae62fa9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat May 16 18:38:32 2009  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/parser.rb: add nil check.
+
 Sat May 16 18:36:01 2009  Kouhei Sutou  <kou@cozmixng.org>
 
 	* test/rss/test_maker_atom_feed.rb: suppress warnings.
diff --git a/lib/rss/parser.rb b/lib/rss/parser.rb
index b78683ca3e..1a9e71ea57 100644
--- a/lib/rss/parser.rb
+++ b/lib/rss/parser.rb
@@ -446,7 +446,7 @@ module RSS
     def start_get_text_element(tag_name, prefix, ns, required_uri)
       pr = Proc.new do |text, tags|
         setter = self.class.setter(required_uri, tag_name)
-        if @last_element.respond_to?(setter)
+        if setter and @last_element.respond_to?(setter)
           if @do_validate
             getter = self.class.getter(required_uri, tag_name)
             if @last_element.__send__(getter)