diff --git a/CHANGELOG.md b/CHANGELOG.md
index 807f169..a00846b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,9 @@
 - `Innmind\Server\Status\Exception\EmptyUserNotAllowed`
 - `Innmind\Server\Status\Exception\LoadAverageCannotBeNegative`
 - `Innmind\Server\Status\Exception\DomainException`
+- `Innmind\Server\Status\Exception\UnsupportedOperatingSystem`
+- `Innmind\Server\Status\Exception\RuntimeException`
+- `Innmind\Server\Status\Exception\Exception`
 
 ## 4.1.1 - 2024-09-30
 
diff --git a/src/Exception/Exception.php b/src/Exception/Exception.php
deleted file mode 100644
index 90cfea4..0000000
--- a/src/Exception/Exception.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-declare(strict_types = 1);
-
-namespace Innmind\Server\Status\Exception;
-
-interface Exception extends \Throwable
-{
-}
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
deleted file mode 100644
index 4c1f4d2..0000000
--- a/src/Exception/RuntimeException.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-declare(strict_types = 1);
-
-namespace Innmind\Server\Status\Exception;
-
-class RuntimeException extends \RuntimeException implements Exception
-{
-}
diff --git a/src/Exception/UnsupportedOperatingSystem.php b/src/Exception/UnsupportedOperatingSystem.php
deleted file mode 100644
index 4f26094..0000000
--- a/src/Exception/UnsupportedOperatingSystem.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-declare(strict_types = 1);
-
-namespace Innmind\Server\Status\Exception;
-
-final class UnsupportedOperatingSystem extends RuntimeException
-{
-}
diff --git a/src/ServerFactory.php b/src/ServerFactory.php
index af653c5..a4c28c2 100644
--- a/src/ServerFactory.php
+++ b/src/ServerFactory.php
@@ -3,32 +3,24 @@
 
 namespace Innmind\Server\Status;
 
-use Innmind\Server\Status\{
-    Servers\OSX,
-    Servers\Linux,
-    Exception\UnsupportedOperatingSystem,
+use Innmind\Server\Status\Servers\{
+    OSX,
+    Linux,
 };
 use Innmind\Server\Control\Server as Control;
 use Innmind\TimeContinuum\Clock;
 
 final class ServerFactory
 {
-    /**
-     * @throws UnsupportedOperatingSystem
-     */
     public static function build(
         Clock $clock,
         Control $control,
         EnvironmentPath $path,
     ): Server {
-        switch (\PHP_OS) {
-            case 'Darwin':
-                return new OSX($clock, $control, $path);
-
-            case 'Linux':
-                return new Linux($clock, $control);
-        }
-
-        throw new UnsupportedOperatingSystem;
+        return match (\PHP_OS) {
+            'Darwin' => new OSX($clock, $control, $path),
+            'Linux' => new Linux($clock, $control),
+            default => throw new \LogicException('Unsupported operating system '.\PHP_OS),
+        };
     }
 }