diff --git a/ChangeLog b/ChangeLog
index dd3253a9ab..0dc77ee653 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Nov 19 01:10:52 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/drb.rb (DRbConn::alive?): fixed NoMethodError problem
+	  from NaHi [ruby-dev:37110].
+
 Wed Nov 19 01:05:26 2008  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* cont.c (cont_mark, cont_capture, cont_restore_1): speed up
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index 0e6212838e..13a89de07f 100644
--- a/lib/drb/drb.rb
+++ b/lib/drb/drb.rb
@@ -1208,6 +1208,7 @@ module DRb
     end
 
     def alive?  # :nodoc:
+      return false unless @protocol
       @protocol.alive?
     end
   end