diff --git a/src/Application.php b/src/Application.php
index f6ea0b98..4b016c2f 100644
--- a/src/Application.php
+++ b/src/Application.php
@@ -64,12 +64,12 @@ class Application extends ApplicationBase
         }
     }
 
-    public function getSession(): Session
+    public function getSession(): ?Session
     {
         return $this->session;
     }
 
-    public function setSession(Session $session): void
+    public function setSession(?Session $session): void
     {
         $this->session = $session;
     }
diff --git a/src/Controllers/AuthController.php b/src/Controllers/AuthController.php
index ee2a3c72..6273ad65 100644
--- a/src/Controllers/AuthController.php
+++ b/src/Controllers/AuthController.php
@@ -171,15 +171,16 @@ class AuthController extends Controller
     public function logout()
     {
         $app = Application::getInstance();
+        $session = $app->getSession();
 
-        if ($app->session === null) {
+        if ($session === null) {
             echo "You aren't logged in.";
         } else {
             echo "You've been logged out.";
             $this->setCookie('uid', '', -3600);
             $this->setCookie('sid', '', -3600);
-            $app->session->delete();
-            $app->session = null;
+            $session->delete();
+            $app->setSession(null);
         }
 
         return '<meta http-equiv="refresh" content="1; url=/">';
diff --git a/src/Users/Role.php b/src/Users/Role.php
index a0cf0219..c65de683 100644
--- a/src/Users/Role.php
+++ b/src/Users/Role.php
@@ -11,7 +11,7 @@ class Role extends Model
     public static function createRole(
         string $name,
         ?int $hierarchy = null,
-        Colour $colour = null,
+        ?Colour $colour = null,
         ?string $title = null,
         ?string $description = null,
         bool $secret = false
diff --git a/src/Users/Session.php b/src/Users/Session.php
index 153d74c5..ef27365a 100644
--- a/src/Users/Session.php
+++ b/src/Users/Session.php
@@ -12,7 +12,7 @@ class Session extends Model
     public static function createSession(
         User $user,
         ?string $userAgent = null,
-        Carbon $expires = null,
+        ?Carbon $expires = null,
         ?string $ipAddress = null
     ): Session {
         $ipAddress = $ipAddress ?? IP::remote();