diff --git a/MiraAPI/Roles/CustomRoleManager.cs b/MiraAPI/Roles/CustomRoleManager.cs
index 314f2589..d89e40a9 100644
--- a/MiraAPI/Roles/CustomRoleManager.cs
+++ b/MiraAPI/Roles/CustomRoleManager.cs
@@ -38,7 +38,7 @@ public static class CustomRoleManager
///
/// Gets the array of all roles from vanilla .
///
- public static RoleBehaviour[] AllRoles => RoleManager.Instance.AllRoles.ToArray();
+ public static RoleBehaviour[] AllRoles => RoleManager.InstanceExists ? RoleManager.Instance.AllRoles.ToArray() : [];
///
/// Gets the of custom roles as objects.
diff --git a/MiraAPI/Roles/CustomRoleUtils.cs b/MiraAPI/Roles/CustomRoleUtils.cs
index c5b1feb3..3e5a03c8 100644
--- a/MiraAPI/Roles/CustomRoleUtils.cs
+++ b/MiraAPI/Roles/CustomRoleUtils.cs
@@ -136,7 +136,12 @@ public static class CustomRoleUtils
public static LoadableAsset? GetIntroSound(RoleTypes roleType)
{
var role = CustomRoleManager.AllRoles.FirstOrDefault(role => role.Role == roleType);
- return role is ICustomRole customRole ? customRole.Configuration.IntroSound : new PreloadedAsset(role!.IntroSound);
+ if (role == null)
+ {
+ return null;
+ }
+
+ return role is ICustomRole customRole ? customRole.Configuration.IntroSound : new PreloadedAsset(role.IntroSound);
}
///