1 files changed, 8 insertions, 0 deletions
diff --git a/src/class.c b/src/class.c
index b5f5f5287..b306cb489 100644
--- a/src/class.c
+++ b/src/class.c
@@ -726,6 +726,14 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
 
         datap = va_arg(ap, void**);
         type = va_arg(ap, struct mrb_data_type const*);
+        if (*format == '!') {
+          format++;
+          if (i < argc && mrb_nil_p(*sp)) {
+            *datap = 0;
+            i++;
+            break;
+          }
+        }
         if (i < argc) {
           *datap = mrb_data_get_ptr(mrb, *sp++, type);
           ++i;