3 files changed, 15 insertions, 0 deletions
diff --git a/tools/mirb/mirb.c b/tools/mirb/mirb.c
index 59e5046cb..35558acfb 100644
--- a/tools/mirb/mirb.c
+++ b/tools/mirb/mirb.c
@@ -142,6 +142,11 @@ main(void)
 
   /* new interpreter instance */ 
   mrb_interpreter = mrb_open();
+  if (mrb_interpreter == NULL) {
+    fprintf(stderr, "Invalid mrb_interpreter, exiting mirb");
+    return EXIT_FAILURE;
+  }
+
   /* new parser instance */
   parser = mrb_parser_new(mrb_interpreter);
   memset(ruby_code, 0, sizeof(*ruby_code));
diff --git a/tools/mrbc/mrbc.c b/tools/mrbc/mrbc.c
index 3553fe646..99fea76d8 100644
--- a/tools/mrbc/mrbc.c
+++ b/tools/mrbc/mrbc.c
@@ -158,6 +158,11 @@ main(int argc, char **argv)
   struct _args args;
   struct mrb_parser_state *p;
 
+  if (mrb == NULL) {
+    fprintf(stderr, "Invalid mrb_state, exiting mrbc");
+    return EXIT_FAILURE;
+  }
+
   n = parse_args(mrb, argc, argv, &args);
 
   if (n < 0 || args.rfp == NULL) {
diff --git a/tools/mruby/mruby.c b/tools/mruby/mruby.c
index 8b227df5d..0e38879db 100644
--- a/tools/mruby/mruby.c
+++ b/tools/mruby/mruby.c
@@ -142,6 +142,11 @@ main(int argc, char **argv)
   struct _args args;
   struct mrb_parser_state *p;
 
+  if (mrb == NULL) {
+    fprintf(stderr, "Invalid mrb_state, exiting mruby");
+    return EXIT_FAILURE;
+  }
+
   n = parse_args(mrb, argc, argv, &args);
   if (n < 0 || (args.cmdline == NULL && args.rfp == NULL)) {
     cleanup(mrb, &args);