diff --git a/etc/mkloader.pl b/etc/mkloader.pl
index 602a8aae..527efd7a 100755
--- a/etc/mkloader.pl
+++ b/etc/mkloader.pl
@@ -41,7 +41,9 @@ pic_load_piclib(pic_state *pic)
 EOL
 
 foreach my $file (@ARGV) {
-    print "  pic_try {\n";
+    print <<EOL;
+  pic_try {
+EOL
     my $var = &escape_v($file);
     my $basename = basename($file);
     my $dirname = basename(dirname($file));
@@ -51,8 +53,7 @@ foreach my $file (@ARGV) {
   pic_catch {
     /* error! */
     xfputs(pic, "fatal error: failure in loading $dirname/$basename\\n", xstderr);
-    xfputs(pic, pic_errmsg(pic), xstderr);
-    pic_panic(pic, "load error");
+    pic_raise(pic, pic->err);
   }
 EOL
 }
diff --git a/src/main.c b/src/main.c
index 5de70fdd..a20c52fe 100644
--- a/src/main.c
+++ b/src/main.c
@@ -44,11 +44,11 @@ main(int argc, char *argv[], char **envp)
   pic = pic_open(pic_default_allocf, NULL);
   pic_set_argv(pic, argc, argv, envp);
 
-  pic_init_picrin(pic);
-
-  PICRIN_MAIN = pic_find_library(pic, pic_read_cstr(pic, "(picrin main)"));
-
   pic_try {
+    pic_init_picrin(pic);
+
+    PICRIN_MAIN = pic_find_library(pic, pic_read_cstr(pic, "(picrin main)"));
+
     pic_funcall(pic, PICRIN_MAIN, "main", pic_nil_value());
   }
   pic_catch {