diff --git a/src/error.c b/src/error.c
index 1adf5cb058..1f352c853f 100644
--- a/src/error.c
+++ b/src/error.c
@@ -134,20 +134,23 @@ exc_inspect(mrb_state *mrb, mrb_value exc)
     mrb_str_cat2(mrb, str, ":");
     mrb_str_append(mrb, str, line);
     mrb_str_cat2(mrb, str, ": ");
-    if (RSTRING_LEN(mesg) > 0) {
+    if (!mrb_nil_p(mesg) && RSTRING_LEN(mesg) > 0) {
       mrb_str_append(mrb, str, mesg);
       mrb_str_cat2(mrb, str, " (");
     }
     mrb_str_cat2(mrb, str, mrb_obj_classname(mrb, exc));
-    if (RSTRING_LEN(mesg) > 0) {
+    if (!mrb_nil_p(mesg) && RSTRING_LEN(mesg) > 0) {
       mrb_str_cat2(mrb, str, ")");
     }
   }
   else {
     str = mrb_str_new2(mrb, mrb_obj_classname(mrb, exc));
-    if (RSTRING_LEN(mesg) > 0) {
+    if (!mrb_nil_p(mesg) && RSTRING_LEN(mesg) > 0) {
       mrb_str_cat2(mrb, str, ": ");
       mrb_str_append(mrb, str, mesg);
+    } else {
+      mrb_str_cat2(mrb, str, ": ");
+      mrb_str_cat2(mrb, str, mrb_obj_classname(mrb, exc));
     }
   }
   return str;
diff --git a/test/t/exception.rb b/test/t/exception.rb
index 2ea319caa2..76c165e958 100644
--- a/test/t/exception.rb
+++ b/test/t/exception.rb
@@ -269,3 +269,6 @@ def exception_test14
   a == :ok
 end
 
+assert('Exception#inspect without message') do
+  Exception.new.inspect
+end