diff --git a/ChangeLog b/ChangeLog
index e60a717480..158df4f231 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Jul 13 14:16:03 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_method.c (method_entry_get_without_cache): check
+	  undefined method even if ruby_running is FALSE.
+
+	  We haven't call "undef"ed methods before ruby_running.
+	  So that this issue does not make troubles.
+
 Wed Jul 13 14:15:22 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
 	* enc/windows_1254.c: Adjust variable/macro names.
diff --git a/vm_method.c b/vm_method.c
index 96fc4b6855..69f98c4421 100644
--- a/vm_method.c
+++ b/vm_method.c
@@ -733,17 +733,19 @@ method_entry_get_without_cache(VALUE klass, ID id,
 	    ent->mid = id;
 
 	    if (UNDEFINED_METHOD_ENTRY_P(me)) {
-		ent->me = 0;
-		me = 0;
+		me = ent->me = NULL;
 	    }
 	    else {
 		ent->me = me;
 	    }
 	}
 	else if (UNDEFINED_METHOD_ENTRY_P(me)) {
-	    me = 0;
+	    me = NULL;
 	}
     }
+    else if (UNDEFINED_METHOD_ENTRY_P(me)) {
+	me = NULL;
+    }
 
     if (defined_class_ptr)
 	*defined_class_ptr = defined_class;