diff --git a/ChangeLog b/ChangeLog
index 3c411ce170..18a3c0e431 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Sep 27 03:15:51 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (vm_jump_tag_but_local_jump): exc is not used if val is nil.
+
 Sat Sep 27 03:12:40 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/socket/socket.c (host_str): numeric address should be unsigned.
diff --git a/vm.c b/vm.c
index d71755afb9..a805c80526 100644
--- a/vm.c
+++ b/vm.c
@@ -841,8 +841,8 @@ vm_make_jump_tag_but_local_jump(int state, VALUE val)
 void
 vm_jump_tag_but_local_jump(int state, VALUE val)
 {
-    VALUE exc = vm_make_jump_tag_but_local_jump(state, val);
     if (val != Qnil) {
+	VALUE exc = vm_make_jump_tag_but_local_jump(state, val);
 	rb_exc_raise(exc);
     }
     JUMP_TAG(state);