1 files changed, 14 insertions, 2 deletions
diff --git a/src/gc.c b/src/gc.c
index 8e8941cd7..fce2c3150 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -686,7 +686,6 @@ gc_mark_children(mrb_state *mrb, mrb_gc *gc, struct RBasic *obj)
 
   case MRB_TT_OBJECT:
   case MRB_TT_DATA:
-  case MRB_TT_EXCEPTION:
     mrb_gc_mark_iv(mrb, (struct RObject*)obj);
     break;
 
@@ -759,6 +758,13 @@ gc_mark_children(mrb_state *mrb, mrb_gc *gc, struct RBasic *obj)
     }
     break;
 
+  case MRB_TT_EXCEPTION:
+    mrb_gc_mark_iv(mrb, (struct RObject*)obj);
+    if ((obj->flags & MRB_EXC_MESG_STRING_FLAG) != 0) {
+      mrb_gc_mark(mrb, (struct RBasic*)((struct RException*)obj)->mesg);
+    }
+    break;
+
   default:
     break;
   }
@@ -989,7 +995,6 @@ gc_gray_counts(mrb_state *mrb, mrb_gc *gc, struct RBasic *obj)
 
   case MRB_TT_OBJECT:
   case MRB_TT_DATA:
-  case MRB_TT_EXCEPTION:
     children += mrb_gc_mark_iv_size(mrb, (struct RObject*)obj);
     break;
 
@@ -1042,6 +1047,13 @@ gc_gray_counts(mrb_state *mrb, mrb_gc *gc, struct RBasic *obj)
     children+=2;
     break;
 
+  case MRB_TT_EXCEPTION:
+    children += mrb_gc_mark_iv_size(mrb, (struct RObject*)obj);
+    if ((obj->flags & MRB_EXC_MESG_STRING_FLAG) != 0) {
+      children++;
+    }
+    break;
+
   default:
     break;
   }