diff --git a/src/API/PlayerAPI.php b/src/API/PlayerAPI.php
index 74055df14..913613a4c 100644
--- a/src/API/PlayerAPI.php
+++ b/src/API/PlayerAPI.php
@@ -258,7 +258,7 @@ class PlayerAPI{
 			$this->server->clients[$CID] = null;
 			unset($this->server->clients[$CID]);
 			$player->close();
-			if($player->username != ""){
+			if($player->username != "" and ($player->data instanceof Config)){
 				$this->saveOffline($player->data);
 			}
 			$this->server->query("DELETE FROM players WHERE name = '".$player->username."';");
diff --git a/src/Player.php b/src/Player.php
index 92c09a28c..b8d79db3e 100644
--- a/src/Player.php
+++ b/src/Player.php
@@ -635,7 +635,9 @@ class Player{
 							$this->data->set("lastIP", $this->ip);
 							$this->data->set("lastID", $this->clientID);
 
-							$this->server->api->player->saveOffline($this->data);
+							if($this->data instanceof Config){
+								$this->server->api->player->saveOffline($this->data);
+							}
 							$this->dataPacket(MC_LOGIN_STATUS, array(
 								"status" => 0,
 							));