diff --git a/src/g_game.cpp b/src/g_game.cpp
index 0db149b0b..506b8e24b 100644
--- a/src/g_game.cpp
+++ b/src/g_game.cpp
@@ -862,7 +862,10 @@ static void ChangeSpy (int changespy)
 	int pnum = consoleplayer;
 	if (changespy != SPY_CANCEL) 
 	{
-		pnum = int(players[consoleplayer].camera->player - players);
+		player_t *player = players[consoleplayer].camera->player;
+		// only use the camera as starting index if it's a valid player.
+		if (player != NULL) pnum = int(players[consoleplayer].camera->player - players);
+
 		int step = (changespy == SPY_NEXT) ? 1 : -1;
 
 		do