1 files changed, 1 insertions, 1 deletions
diff --git a/class.c b/class.c
index de837c6aa4..3c08ea4fab 100644
--- a/class.c
+++ b/class.c
@@ -1788,7 +1788,7 @@ rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...)
 	    if (!NIL_P(hash)) {
 		VALUE opts = rb_extract_keywords(&hash);
 		if (!hash) argc--;
-		hash = opts;
+		hash = opts ? opts : Qnil;
 	    }
 	}
     }