diff --git a/src/API/PlayerAPI.php b/src/API/PlayerAPI.php
index 525798e9c..ed2e45d6a 100644
--- a/src/API/PlayerAPI.php
+++ b/src/API/PlayerAPI.php
@@ -402,7 +402,7 @@ class PlayerAPI{
 
     public function spawnToAllPlayers(Player $player){
         foreach($this->getAll() as $p){
-            if($p !== $player and ($p->entity instanceof Entity)){
+            if($p !== $player and ($p->entity instanceof Entity) and ($player->entity instanceof Entity)){
                 $player->entity->spawn($p);
                 if($p->level !== $player->level){
                     $p->dataPacket(MC_MOVE_ENTITY_POSROT, array(
diff --git a/src/Player.php b/src/Player.php
index 70efef7b7..53976b7e9 100644
--- a/src/Player.php
+++ b/src/Player.php
@@ -44,6 +44,7 @@ class Player{
 	private $startAction = false;
 	private $isSleeping = false;
 	public $data;
+    /** @var \Entity */
 	public $entity = false;
 	public $auth = false;
 	public $CID;
@@ -78,6 +79,8 @@ class Player{
 	private $chunkCount = array();
 	private $received = array();
 	public $realmsData = array();
+    /** @var \Level */
+    public $level;
 	
 	public function __get($name){
 		if(isset($this->{$name})){