diff --git a/src/main/java/emu/nebula/game/player/Player.java b/src/main/java/emu/nebula/game/player/Player.java
index e15c709..7929158 100644
--- a/src/main/java/emu/nebula/game/player/Player.java
+++ b/src/main/java/emu/nebula/game/player/Player.java
@@ -172,9 +172,16 @@ public class Player implements GameDatabaseObject {
     
     public void setSession(GameSession session) {
         if (this.session != null) {
+            // Sanity check
+            if (this.session == session) {
+                return;
+            }
+            
+            // Clear player from session
             this.session.clearPlayer();
         }
         
+        // Set session
         this.session = session;
     }
     
diff --git a/src/main/java/emu/nebula/game/player/PlayerModule.java b/src/main/java/emu/nebula/game/player/PlayerModule.java
index 74dd1dd..e56c799 100644
--- a/src/main/java/emu/nebula/game/player/PlayerModule.java
+++ b/src/main/java/emu/nebula/game/player/PlayerModule.java
@@ -136,8 +136,7 @@ public class PlayerModule extends GameContextModule {
         // Put in player cache
         this.addToCache(player);
         
-        // Set player for session
-        session.setPlayer(player);
+        System.out.println("created player");
 
         return player;
     }