diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0cb1f5ff1..eaeb76fda 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,6 +7,7 @@ jobs:
         cfg:
           - { os: 'ubuntu-24.04', php: '8.3' }
           - { os: 'ubuntu-24.04', php: '8.4' }
+          - { os: 'ubuntu-24.04', php: '8.5' }
     runs-on: ${{ matrix.cfg.os }}
     steps:
       - name: Checkout Code
@@ -40,6 +41,7 @@ jobs:
         cfg:
           - { os: 'ubuntu-24.04', php: '8.3' }
           - { os: 'ubuntu-24.04', php: '8.4' }
+          - { os: 'ubuntu-24.04', php: '8.5' }
     runs-on: ${{ matrix.cfg.os }}
     steps:
       - name: Checkout Code
@@ -106,6 +108,7 @@ jobs:
         cfg:
           - { os: 'ubuntu-24.04', php: '8.3' }
           - { os: 'ubuntu-24.04', php: '8.4' }
+          - { os: 'ubuntu-24.04', php: '8.5' }
     runs-on: ${{ matrix.cfg.os }}
     steps:
       - name: Checkout Code
diff --git a/pinc/ProjectState.inc b/pinc/ProjectState.inc
index dbe2aee62..a3e5e338a 100644
--- a/pinc/ProjectState.inc
+++ b/pinc/ProjectState.inc
@@ -50,21 +50,33 @@ class ProjectStates
 
     public static function get_medium_label(?string $state): string
     {
+        if (is_null($state)) {
+            return '';
+        }
         return self::$states[$state]->medium_label ?? '';
     }
 
     public static function get_label(?string $state): string
     {
+        if (is_null($state)) {
+            return '';
+        }
         return self::$states[$state]->label ?? '';
     }
 
     public static function get_forum(?string $state): int
     {
+        if (is_null($state)) {
+            return -1;
+        }
         return self::$states[$state]->forum ?? -1;
     }
 
     public static function get_phase(?string $state): string
     {
+        if (is_null($state)) {
+            return 'NONE';
+        }
         return self::$states[$state]->phase ?? 'NONE';
     }
 }