diff --git a/type.lobby/src/main/java/net/swofty/type/lobby/parkour/LobbyParkourManager.java b/type.lobby/src/main/java/net/swofty/type/lobby/parkour/LobbyParkourManager.java
index 76402c9bf..4aaf85d61 100644
--- a/type.lobby/src/main/java/net/swofty/type/lobby/parkour/LobbyParkourManager.java
+++ b/type.lobby/src/main/java/net/swofty/type/lobby/parkour/LobbyParkourManager.java
@@ -129,12 +129,14 @@ public void startParkour(HypixelPlayer player) {
 	}
 
 	public void finishedParkour(HypixelPlayer player) {
-		Long startTime = perPlayerStartTime.get(player.getUuid()).startTime();
-		if (startTime == null) {
+		RunData runData = perPlayerStartTime.get(player.getUuid());
+		if (runData == null || runData.startTime() == null) {
 			player.sendMessage("§cYou haven't started the parkour challenge yet! Use §e/parkour start §cto start!");
 			return;
 		}
 
+		long startTime = runData.startTime();
+
 		int lastCheckpointIndex = perPlayerStartTime.get(player.getUuid()).lastCheckpointIndex();
 		if (lastCheckpointIndex != parkour.getCheckpoints().size() - 2) {
 			player.sendMessage("§cYou must go through all checkpoints before finishing the parkour challenge!");