diff --git a/src/resources/player/Player.java b/src/resources/player/Player.java
index 401c4d0cf..4e3ff3c6d 100644
--- a/src/resources/player/Player.java
+++ b/src/resources/player/Player.java
@@ -215,6 +215,8 @@ public class Player implements Serializable, Comparable<Player> {
 	
 	@Override
 	public int hashCode() {
+		if (creatureObject == null)
+			return getUserId();
 		return Long.valueOf(creatureObject.getObjectId()).hashCode() ^ getUserId();
 	}