diff --git a/src/Graphwar/GameData.java b/src/Graphwar/GameData.java
index 9b59423..e18470a 100644
--- a/src/Graphwar/GameData.java
+++ b/src/Graphwar/GameData.java
@@ -115,6 +115,7 @@ public void connect(String ip, int port) throws IOException
 		currentTurn = -1;
 		turnTimeUp = false;
 		nextTurnSent = false;
+		nextPCs.clear();
 		
 		new Thread(this).start();
 		
@@ -151,7 +152,7 @@ public Player getFirstLocalPlayer()
     	{
     		Player player = itr.next();
     		
-    		if(player.isLocalPlayer())
+    		if(player.isLocalPlayer() && !(player instanceof ComputerPlayer))
     		{
     			return player;
     		}