diff --git a/ChangeLog b/ChangeLog
index 05b58fc527..87675e401f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Oct 28 23:52:48 2015  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* probes_helper.h (RUBY_DTRACE_HOOK): add RB_GC_GUARD, though paranoic.
+
 Wed Oct 28 15:36:11 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* error.c (rb_name_err_new): store the receiver directly.
diff --git a/probes_helper.h b/probes_helper.h
index f01cbc374a..53eaf57d73 100644
--- a/probes_helper.h
+++ b/probes_helper.h
@@ -45,10 +45,12 @@ do { \
 				filename, \
 				rb_sourceline()); \
 		    } \
+		    RB_GC_GUARD(_name); \
 		    break; \
 		} \
 	    } \
 	} \
+	RB_GC_GUARD(_klass); \
     } \
 } while (0)