diff --git a/src/main/java/net/socialgamer/cah/data/User.java b/src/main/java/net/socialgamer/cah/data/User.java
index 3ff3960..668c8bc 100644
--- a/src/main/java/net/socialgamer/cah/data/User.java
+++ b/src/main/java/net/socialgamer/cah/data/User.java
@@ -294,8 +294,9 @@ public class User {
    */
   public void noLongerValid() {
     if (currentGame != null) {
-      currentGame.removePlayer(this);
-      currentGame.removeSpectator(this);
+      final Game game = currentGame;
+      game.removePlayer(this);
+      game.removeSpectator(this);
     }
     valid = false;
   }