diff --git a/src/main/java/forge/game/player/AIPlayer.java b/src/main/java/forge/game/player/AIPlayer.java
index 51584e7fed9..f09d46c57cc 100644
--- a/src/main/java/forge/game/player/AIPlayer.java
+++ b/src/main/java/forge/game/player/AIPlayer.java
@@ -29,8 +29,6 @@ import forge.game.ai.AiController;
  * @version $Id$
  */
 public class AIPlayer extends Player {
-
-    private final PlayerControllerAi controller;
     /**
      * <p>
      * Constructor for AIPlayer.
@@ -46,7 +44,7 @@ public class AIPlayer extends Player {
     }
 
     public AiController getAi() { 
-        return controller.getAi();
+        return controller instanceof PlayerControllerAi ? ((PlayerControllerAi) controller).getAi() : null;
     }
     
 } // end AIPlayer class
diff --git a/src/main/java/forge/game/player/HumanPlayer.java b/src/main/java/forge/game/player/HumanPlayer.java
index d6507df242c..2337f274028 100644
--- a/src/main/java/forge/game/player/HumanPlayer.java
+++ b/src/main/java/forge/game/player/HumanPlayer.java
@@ -39,8 +39,6 @@ import forge.game.GameActionUtil;
 import forge.game.GameState;
 
 public class HumanPlayer extends Player {
-    private final PlayerControllerHuman controller;
-    
     public HumanPlayer(final LobbyPlayerHuman player, GameState game) {
         super(player, game);
         controller = new PlayerControllerHuman(game, this);
diff --git a/src/main/java/forge/game/player/Player.java b/src/main/java/forge/game/player/Player.java
index e16b1ac159e..ef2ca0d62f9 100644
--- a/src/main/java/forge/game/player/Player.java
+++ b/src/main/java/forge/game/player/Player.java
@@ -158,7 +158,7 @@ public class Player extends GameEntity implements Comparable<Player> {
     private Card currentPlane = null;
 
     private PlayerStatistics stats = new PlayerStatistics();
-    private PlayerController controller;
+    protected PlayerController controller;
     private final LobbyPlayer lobbyPlayer;
     
     private final List<Card> schemeDeck = new ArrayList<Card>();