diff --git a/PluralKit.API/Controllers/SystemController.cs b/PluralKit.API/Controllers/SystemController.cs
index 65cb575b..9024509c 100644
--- a/PluralKit.API/Controllers/SystemController.cs
+++ b/PluralKit.API/Controllers/SystemController.cs
@@ -92,6 +92,8 @@ namespace PluralKit.API.Controllers
             if (system == null) return NotFound("System not found.");
             
             var sw = await _switches.GetLatestSwitch(system);
+            if (sw == null) return NotFound("System has no registered switches."); 
+                
             var members = await _switches.GetSwitchMembers(sw);
             return Ok(new FrontersReturn
             {