diff --git a/Entities/EntityList.cs b/Entities/EntityList.cs
index 39bfe1e41..96f4c1607 100644
--- a/Entities/EntityList.cs
+++ b/Entities/EntityList.cs
@@ -57,7 +57,8 @@ namespace ClassicalSharp {
 			get { return Players[id]; }
 			set { 
 				Players[id] = value;
-				value.ID = (byte)id;
+				if( value != null )
+					value.ID = (byte)id;
 			}
 		}
 	}