diff --git a/ChangeLog b/ChangeLog
index 8e5145f108..fdbfe24098 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Wed May 30 13:32:34 2007  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (ResponseParser#next_token): fixed
+	  error message.
+
+	* lib/net/imap.rb (ResponseParser#parse_error): fixed
+	  the condition not to refer @token.symbol unexpectedly.
+	  Thanks, Dick Monahan.
+
 Wed May 30 13:24:33 2007  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/ftp.rb (Net::FTP#transfercmd): skip 2XX
diff --git a/lib/net/imap.rb b/lib/net/imap.rb
index 75d027c9ee..c6be5030b9 100644
--- a/lib/net/imap.rb
+++ b/lib/net/imap.rb
@@ -2948,7 +2948,7 @@ module Net
             elsif $7
               return Token.new(T_RPAR, $+)
             else
-              parse_error("[Net::IMAP BUG] BEG_REGEXP is invalid")
+              parse_error("[Net::IMAP BUG] DATA_REGEXP is invalid")
             end
           else
             @str.index(/\S*/n, @pos)
@@ -3002,7 +3002,7 @@ module Net
           $stderr.printf("@str: %s\n", @str.dump)
           $stderr.printf("@pos: %d\n", @pos)
           $stderr.printf("@lex_state: %s\n", @lex_state)
-          if @token.symbol
+          if @token
             $stderr.printf("@token.symbol: %s\n", @token.symbol)
             $stderr.printf("@token.value: %s\n", @token.value.inspect)
           end