diff --git a/ChangeLog b/ChangeLog
index 06280f4173..a6f7a8f83d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Mar 14 22:07:38 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_thread_raise): err at unstarted thread.  (PR#1302)
+
 Sat Mar 13 14:56:32 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* test/drb/ut_drb.rb: use 'druby://localhost:0'. [ruby-dev:23078]
diff --git a/eval.c b/eval.c
index d308a2b8e1..bcff81b03d 100644
--- a/eval.c
+++ b/eval.c
@@ -11793,6 +11793,9 @@ rb_thread_raise(argc, argv, th)
 {
     volatile rb_thread_t th_save = th;
 
+    if (!th->next) {
+	rb_raise(rb_eArgError, "unstarted thread");
+    }
     if (rb_thread_dead(th)) return Qnil;
     if (curr_thread == th) {
 	rb_f_raise(argc, argv);