1 files changed, 6 insertions, 2 deletions
diff --git a/eval.c b/eval.c
index 35669c8395..d6d2b7afc7 100644
--- a/eval.c
+++ b/eval.c
@@ -413,14 +413,18 @@ rb_longjmp(int tag, volatile VALUE mesg)
 void
 rb_exc_raise(VALUE mesg)
 {
-    mesg = rb_make_exception(1, &mesg);
+    if (!NIL_P(mesg)) {
+	mesg = rb_make_exception(1, &mesg);
+    }
     rb_longjmp(TAG_RAISE, mesg);
 }
 
 void
 rb_exc_fatal(VALUE mesg)
 {
-    mesg = rb_make_exception(1, &mesg);
+    if (!NIL_P(mesg)) {
+	mesg = rb_make_exception(1, &mesg);
+    }
     rb_longjmp(TAG_FATAL, mesg);
 }