diff --git a/ChangeLog b/ChangeLog
index 183fff5a0a..64b53c2237 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jun  4 04:50:12 2015  Koichi Sasada  <ko1@atdot.net>
+
+	* class.c (method_entry_i): mtbl should not have `me' as NULL.
+
 Thu Jun  4 04:28:45 2015  Koichi Sasada  <ko1@atdot.net>
 
 	* class.c (clone_method): do not use me->klass, but use explicitly
diff --git a/class.c b/class.c
index 67efd6c5cc..1dea8b01d9 100644
--- a/class.c
+++ b/class.c
@@ -1123,7 +1123,7 @@ method_entry_i(st_data_t key, st_data_t value, st_data_t data)
     struct method_entry_arg *arg = (struct method_entry_arg *)data;
     rb_method_visibility_t type;
 
-    if (me && me->def->type == VM_METHOD_TYPE_REFINED) {
+    if (me->def->type == VM_METHOD_TYPE_REFINED) {
 	VALUE klass = me->klass;
 	me = rb_resolve_refined_method(Qnil, me, NULL);
 	if (!me) return ST_CONTINUE;