1 files changed, 1 insertions, 0 deletions
diff --git a/object.c b/object.c
index edec861a20..0ecb408bae 100644
--- a/object.c
+++ b/object.c
@@ -1410,6 +1410,7 @@ rb_class_superclass(VALUE klass)
     VALUE super = RCLASS_SUPER(klass);
 
     if (!super) {
+	if (klass == rb_cBasicObject) return Qnil;
 	rb_raise(rb_eTypeError, "uninitialized class");
     }
     while (TYPE(super) == T_ICLASS) {