diff --git a/ChangeLog b/ChangeLog
index fa2ff7c4d9..77f560e98e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May  7 09:17:51 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* eval.c (superclass): undesirable "unexpected return" when the
+	  superclass is not a Class.
+
 Sun May  5 06:53:45 2002  Akinori MUSHA  <knu@iDaemons.org>
 
 	* lib/mkmf.rb: exclude topdir from the system configuration
diff --git a/eval.c b/eval.c
index 4cbdc79c08..77d2f571d8 100644
--- a/eval.c
+++ b/eval.c
@@ -1445,7 +1445,6 @@ superclass(self, node)
     }
     POP_TAG();
     if (state) {
-      superclass_error:
 	switch (nd_type(node)) {
 	  case NODE_COLON2:
 	    rb_raise(rb_eTypeError, "undefined superclass `%s'",
@@ -1458,7 +1457,10 @@ superclass(self, node)
 	}
 	JUMP_TAG(state);
     }
-    if (TYPE(val) != T_CLASS) goto superclass_error;
+    if (TYPE(val) != T_CLASS) {
+	rb_raise(rb_eTypeError, "superclass must be a Class (%s given)",
+		 rb_class2name(CLASS_OF(val)));
+    }
     if (FL_TEST(val, FL_SINGLETON)) {
 	rb_raise(rb_eTypeError, "can't make subclass of virtual class");
     }