diff --git a/battlefy/models/tournament/team.py b/battlefy/models/tournament/team.py
index 553564b..d9ae457 100644
--- a/battlefy/models/tournament/team.py
+++ b/battlefy/models/tournament/team.py
@@ -4,7 +4,7 @@
 
 
 class Player:
-    id: str
+    id: Optional[str]
     on_team: bool
     is_free_agent: bool
     be_captain: bool
@@ -20,7 +20,7 @@ class Player:
     discord_id: Optional[str]
 
     def __init__(self, data: dict) -> None:
-        self.id = data.get("_id")
+        self.id = data.get("_id", None)
         self.on_team = data.get("onTeam")
         self.is_free_agent = data.get("isFreeAgent")
         self.be_captain = data.get("beCaptain")
@@ -97,12 +97,12 @@ class Team:
     player_ids: List[str]
     captain_id: str
     checked_in_at: Optional[datetime]
-    captain: Player
+    captain: Optional[Player]
     players: List[Player]
     persistent_team: PersistentTeam
 
     def __init__(self, data: dict) -> None:
-        self.id = data.get("_id")
+        self.id = data.get("_id", None)
         self.name = data.get("name")
         self.pending_team_id = data.get("pendingTeamID")
         self.persistent_team_id = data.get("persistentTeamID")
@@ -116,7 +116,8 @@ def __init__(self, data: dict) -> None:
         self.captain_id = data.get("captainID")
         if "checkedInAt" in data:
             self.checked_in_at = parser.isoparse(data.get("checkedInAt"))
-        self.captain = Player(data.get("captain"))
+        if "captain" in data:
+            self.captain = Player(data.get("captain"))
         self.players = [Player(p) for p in data.get("players", [])]
         self.persistent_team = PersistentTeam(data.get("persistentTeam", {}))
 
diff --git a/pyproject.toml b/pyproject.toml
index 23db0de..5ebf9ff 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "battlefy.py"
-version = "0.5.0"
+version = "0.5.1"
 description = "A Python Library for Battlefy.com"
 authors = ["Vincent Lee <vlee@vlee.me.uk>"]
 license = "MIT"