diff --git a/authentic-init.pl b/authentic-init.pl
index 685bc874a..344af8c32 100644
--- a/authentic-init.pl
+++ b/authentic-init.pl
@@ -162,9 +162,10 @@ sub embed_favicon
         $manifest_contents =~ s/\%desc\%/$manifest_desc/;
         $manifest_contents =~ s/\%prod\%/$product_name/g;
         $manifest_contents =~ s/\%color\%/$theme_user_color/;
-        $main::ignore_errors = 1;
-        write_file_contents("$theme_config_dir/manifest-$product_name.json", $manifest_contents) if (-w $theme_config_dir);
-        $main::ignore_errors = 0;
+        eval {
+            $main::error_must_die = 1;
+            write_file_contents("$theme_config_dir/manifest-$product_name.json", $manifest_contents) if (-w $theme_config_dir);
+        };
 
         print ' <script src="' . $theme_webprefix . '/service-worker.js" defer></script>' . "\n";
         print ' <link ' . $ref_link . ' crossorigin="use-credentials" rel="manifest" href="' .
diff --git a/authentic.pl b/authentic.pl
index f505f7c8f..22736891c 100644
--- a/authentic.pl
+++ b/authentic.pl
@@ -1010,7 +1010,8 @@ sub theme_ui_alert_box
     } elsif ($class eq "danger") {
         $type = 'alert-danger', $tmsg = ($theme_text{'theme_xhred_global_error'} . '!'), $fa = 'fa-bolt';
     } elsif ($class eq "danger-fatal") {
-        $type = 'alert-danger-fatal', $tmsg = ($theme_text{'theme_xhred_global_error_fatal'} . '!'), $fa = 'fa-exclamation-triangle';
+        $type = 'alert-danger-fatal', $tmsg = ($theme_text{'theme_xhred_global_error_fatal'} . '!'),
+          $fa = 'fa-exclamation-triangle';
     }
 
     my $tmsg_space = " ";
@@ -1333,18 +1334,20 @@ sub theme_redirect
         print "Location: $arg1\n\n";
         return;
     } elsif (string_contains($arg1, '../')) {
-        $main::ignore_errors = 1;
-        set_theme_temp_data('redirected', $arg1) if ($arg1 !~ /switch\.cgi/);
-        $main::ignore_errors = 0;
+        eval {
+            $main::error_must_die = 1;
+            set_theme_temp_data('redirected', $arg1) if ($arg1 !~ /switch\.cgi/);
+        };
         print "Location: $arg1\n\n";
         return;
     }
 
     if (!theme_redirect_download($url)) {
-        $main::ignore_errors = 1;
-        set_theme_temp_data('redirected', $url)
-          if (!theme_set_redirect_forbidden($url));
-        $main::ignore_errors = 0;
+        eval {
+            $main::error_must_die = 1;
+            set_theme_temp_data('redirected', $url)
+              if (!theme_set_redirect_forbidden($url));
+        };
         print "Location: $url\n\n";
     }
 }
@@ -1508,10 +1511,11 @@ sub theme_ui_text_color
     return "<span class=\"ui_text_color text_type_$type text-$type\">$text</span>\n";
 }
 
-sub theme_error {
-    my $error_what = ($main::whatfailed ? "$main::whatfailed : " : "");
+sub theme_error
+{
+    my $error_what    = ($main::whatfailed ? "$main::whatfailed : " : "");
     my $error_message = join(", ", @_);
-    my $error = html_escape(html_strip(($error_what . $error_message)));
+    my $error         = html_escape(html_strip(($error_what . $error_message)));
     print ui_alert_box("<tt class='font-size-90pf'>$error</tt>", 'danger-fatal', undef, 1);
 }