diff --git a/ChangeLog b/ChangeLog
index 839c063fb3..77899295e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb  5 07:39:33 2009  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* ext/readline/readline.c (Init_readline): remove_history(0) may be
+	  NULL.  [ruby-dev:37891]
+
 Thu Feb  5 03:55:22 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* time.c (LOCALTIME): should call tzset() before localtime_r().
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index 7912989c21..124609cf57 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -1287,8 +1287,10 @@ Init_readline()
 #else
 	{
 	    HIST_ENTRY *entry = remove_history(0);
-	    free((char *)entry->line);
-	    free(entry);
+	    if (entry) {
+		free((char *)entry->line);
+		free(entry);
+	    }
 	}
 #endif
     }