diff --git a/src/rooms/logic/Handler/PlayerHandler.ts b/src/rooms/logic/Handler/PlayerHandler.ts
index 9348d53..74214eb 100644
--- a/src/rooms/logic/Handler/PlayerHandler.ts
+++ b/src/rooms/logic/Handler/PlayerHandler.ts
@@ -46,10 +46,10 @@ export class PlayerHandler {
     };
 
     public clear(bresetAll: boolean = false){
-        this._self = null;
         this._pets.forEach((item: PetHandler)=>{
             item.clear(bresetAll);
         });
+        this._self = null;
         this._pets.length = 0;
     };
 
@@ -326,7 +326,7 @@ export class PlayerHandler {
     };
 
     public die(){
-        this.clear();
+        this.clear(true);
         //todo:
     };
 
@@ -427,7 +427,7 @@ export class PlayerHandler {
             }
         });
 
-        if(this._self != apet){
+        if(this._self && this._self != apet){
             if(this._self.removeEffHalo(apet)){
                 lst.push(this._self);
             }