1 files changed, 3 insertions, 0 deletions
diff --git a/eval.c b/eval.c
index e1599fe5d7..71c012623c 100644
--- a/eval.c
+++ b/eval.c
@@ -1777,6 +1777,9 @@ cvar_cbase()
 	    rb_warn("class variable access from toplevel singleton method");
 	}
     }
+    if (NIL_P(cref->nd_clss)) {
+	rb_raise(rb_eTypeError, "no class variables available");
+    }
     return cref->nd_clss;
 }