diff --git a/resources/lib/UnitySite.php b/resources/lib/UnitySite.php
index 09d81404..b0b6b3e4 100644
--- a/resources/lib/UnitySite.php
+++ b/resources/lib/UnitySite.php
@@ -3,24 +3,35 @@
 namespace UnityWebPortal\lib;
 
 use phpseclib3\Crypt\PublicKeyLoader;
-use UnityWebPortal\lib\exceptions\PhpUnitNoDieException;
+use UnityWebPortal\lib\exceptions\NoDieException;
 
 class UnitySite
 {
-    public static function die($x = null, $show_user = false)
+    private static function die($msg)
     {
         if (CONFIG["site"]["allow_die"] == false) {
-            if (is_null($x)) {
-                throw new PhpUnitNoDieException();
-            } else {
-                throw new PhpUnitNoDieException($x);
-            }
+            throw new NoDieException($msg);
         } else {
-            if (!is_null($x) and $show_user) {
-                die($x);
-            } else {
-                die();
-            }
+            $errorid = uniqid();
+            $e["unity_error_id"] = $errorid;
+            self::errorLog("internal server error", json_encode($e));
+            echo "
+                <h1>$msg</h1>
+                <p>
+                    Please notify a Unity admin at "
+                    . CONFIG["mail"]["support"]
+                    . ". Error ID: $errorid.
+                </p>
+            ";
+            // if content already printed, status code will be ignored and alert text may not be
+            // shown in the webpage in an obvious way, so make a popup
+            self::alert(
+                $msg
+                . " Please notify a Unity admin at "
+                . CONFIG["mail"]["support"]
+                . ". Error ID: $errorid."
+            );
+            die();
         }
     }
 
@@ -59,16 +70,14 @@ public static function badRequest($message)
     {
         self::headerResponseCode(400, "bad request");
         self::errorLog("bad request", $message);
-        error_clear_last();
-        self::die($message);
+        self::die("Requested action or provided data is invalid.");
     }
 
     public static function forbidden($message)
     {
         self::headerResponseCode(403, "forbidden");
         self::errorLog("forbidden", $message);
-        error_clear_last();
-        self::die($message);
+        self::die("Permission denied.");
     }
 
     // https://www.php.net/manual/en/function.register-shutdown-function.php
@@ -84,25 +93,7 @@ public static function shutdown()
         if (!headers_sent()) {
             self::headerResponseCode(500, "internal server error");
         }
-        $errorid = uniqid();
-        $e["unity_error_id"] = $errorid;
-        self::errorLog("internal server error", json_encode($e));
-        echo "
-            <h1>An internal server error has occurred.</h1>
-            <p>
-                Please notify a Unity admin at "
-                . CONFIG["mail"]["support"]
-                . ". Error ID: $errorid.
-            </p>
-        ";
-        // if content already printed, status code will be ignored and alert text may not be
-        // shown in the webpage in an obvious way, so make a popup
-        self::alert(
-            "An internal server error has occurred. "
-            . "Please notify a Unity admin at "
-            . CONFIG["mail"]["support"]
-            . ". Error ID: $errorid."
-        );
+        self::die("An internal server error has occurred.");
     }
 
     public static function arrayGetOrBadRequest(array $array, ...$keys)
diff --git a/resources/lib/exceptions/PhpUnitNoDieException.php b/resources/lib/exceptions/NoDieException.php
similarity index 53%
rename from resources/lib/exceptions/PhpUnitNoDieException.php
rename to resources/lib/exceptions/NoDieException.php
index c8a0a0eb..49d8b2d8 100644
--- a/resources/lib/exceptions/PhpUnitNoDieException.php
+++ b/resources/lib/exceptions/NoDieException.php
@@ -2,6 +2,6 @@
 
 namespace UnityWebPortal\lib\exceptions;
 
-class PhpUnitNoDieException extends \Exception
+class NoDieException extends \Exception
 {
 }
diff --git a/test/functional/NewUserTest.php b/test/functional/NewUserTest.php
index 0224cf24..d06ca3de 100644
--- a/test/functional/NewUserTest.php
+++ b/test/functional/NewUserTest.php
@@ -2,7 +2,6 @@
 
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\Attributes\DataProvider;
-use UnityWebPortal\lib\exceptions\PhpUnitNoDieException;
 use UnityWebPortal\lib\UnityGroup;
 use UnityWebPortal\lib\UnityOrg;
 use UnityWebPortal\lib\UnitySQL;
diff --git a/test/functional/ViewAsUserTest.php b/test/functional/ViewAsUserTest.php
index 9c298586..c4a7e859 100644
--- a/test/functional/ViewAsUserTest.php
+++ b/test/functional/ViewAsUserTest.php
@@ -1,7 +1,6 @@
 <?php
 
 use UnityWebPortal\lib\UnitySite;
-use UnityWebPortal\lib\exceptions\PhpUnitNoDieException;
 use PHPUnit\Framework\TestCase;
 
 class ViewAsUserTest extends TestCase
diff --git a/test/phpunit-bootstrap.php b/test/phpunit-bootstrap.php
index b5d1b2e7..a435b6c0 100644
--- a/test/phpunit-bootstrap.php
+++ b/test/phpunit-bootstrap.php
@@ -15,7 +15,7 @@
 require_once __DIR__ . "/../resources/lib/UnityWebhook.php";
 require_once __DIR__ . "/../resources/lib/UnityRedis.php";
 require_once __DIR__ . "/../resources/lib/UnityGithub.php";
-require_once __DIR__ . "/../resources/lib/exceptions/PhpUnitNoDieException.php";
+require_once __DIR__ . "/../resources/lib/exceptions/NoDieException.php";
 require_once __DIR__ . "/../resources/lib/exceptions/SSOException.php";
 
 $_SERVER["HTTP_HOST"] = "phpunit"; // used for config override
@@ -91,7 +91,7 @@ function http_post(string $phpfile, array $post_data): void
     $post_did_redirect_or_die = false;
     try {
         include $phpfile;
-    } catch (UnityWebPortal\lib\exceptions\PhpUnitNoDieException $e) {
+    } catch (UnityWebPortal\lib\exceptions\NoDieException $e) {
         $post_did_redirect_or_die = true;
     } finally {
         ob_get_clean(); // discard output
diff --git a/test/unit/UnitySiteTest.php b/test/unit/UnitySiteTest.php
index 796f1dd2..5a41c8ef 100644
--- a/test/unit/UnitySiteTest.php
+++ b/test/unit/UnitySiteTest.php
@@ -4,7 +4,7 @@
 
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\Attributes\DataProvider;
-use UnityWebPortal\lib\exceptions\PhpUnitNoDieException;
+use UnityWebPortal\lib\exceptions\NoDieException;
 // use PHPUnit\Framework\Attributes\BackupGlobals;
 // use PHPUnit\Framework\Attributes\RunTestsInSeparateProcess;
 
@@ -108,7 +108,7 @@ public function testArrayGetOrBadRequestReturnsArrayWhenTraversingPartially()
     public function testArrayGetOrBadRequestThrowsOnMissingKeyFirstLevel()
     {
         $array = ['x' => 1];
-        $this->expectException(PhpUnitNoDieException::class);
+        $this->expectException(NoDieException::class);
         $this->expectExceptionMessage('["y"]');
         UnitySite::arrayGetOrBadRequest($array, 'y');
     }
@@ -116,7 +116,7 @@ public function testArrayGetOrBadRequestThrowsOnMissingKeyFirstLevel()
     public function testArrayGetOrBadRequestThrowsOnMissingKeyNested()
     {
         $array = ['a' => []];
-        $this->expectException(PhpUnitNoDieException::class);
+        $this->expectException(NoDieException::class);
         // Should include both levels
         $this->expectExceptionMessage('["a","b"]');
         UnitySite::arrayGetOrBadRequest($array, 'a', 'b');
@@ -125,7 +125,7 @@ public function testArrayGetOrBadRequestThrowsOnMissingKeyNested()
     public function testArrayGetOrBadRequestThrowsWhenValueIsNullButKeyNotSet()
     {
         $array = ['a' => null];
-        $this->expectException(PhpUnitNoDieException::class);
+        $this->expectException(NoDieException::class);
         $this->expectExceptionMessage('["a"]');
         UnitySite::arrayGetOrBadRequest($array, 'a');
     }