diff --git a/scripts/commands/pvp.py b/scripts/commands/pvp.py
index e7c27d07..8fbdc155 100644
--- a/scripts/commands/pvp.py
+++ b/scripts/commands/pvp.py
@@ -47,30 +47,30 @@ def run(core, actor, target, commandString):
 	
 	if factionStatus == FactionStatus.OnLeave:
 		actor.sendSystemMessage('@faction_recruiter:on_leave_to_covert', 0)
-		actor.setPvpStatus(PvpStatus.GoingCovert, True)
+		#actor.setPvpStatus(PvpStatus.GoingCovert, True)
 		time.sleep(1)
 		actor.setFactionStatus(FactionStatus.Combatant)
-		actor.setPvpStatus(PvpStatus.GoingCovert, False)
+		#actor.setPvpStatus(PvpStatus.GoingCovert, False)
 		actor.sendSystemMessage('@faction_recruiter:covert_complete', 0)
 		actor.updatePvpStatus()
 		return
 	
 	if factionStatus == FactionStatus.Combatant:
 		actor.sendSystemMessage('@faction_recruiter:covert_to_overt', 0)
-		actor.setPvpStatus(PvpStatus.GoingOvert, True)
+		#actor.setPvpStatus(PvpStatus.GoingOvert, True)
 		time.sleep(30)
 		actor.setFactionStatus(FactionStatus.SpecialForces)
-		actor.setPvpStatus(PvpStatus.GoingOvert, False)
+		#actor.setPvpStatus(PvpStatus.GoingOvert, False)
 		actor.sendSystemMessage('@faction_recruiter:overt_complete', 0)
 		actor.updatePvpStatus()
 		return
 	
 	if factionStatus == FactionStatus.SpecialForces:
 		actor.sendSystemMessage('@faction_recruiter:overt_to_covert', 0)
-		actor.setPvpStatus(PvpStatus.GoingCovert, True)
+		#actor.setPvpStatus(PvpStatus.GoingCovert, True)
 		time.sleep(300)
 		actor.setFactionStatus(FactionStatus.Combatant)
-		actor.setPvpStatus(PvpStatus.GoingCovert, False)
+		#actor.setPvpStatus(PvpStatus.GoingCovert, False)
 		actor.sendSystemMessage('@faction_recruiter:covert_complete', 0)
 		actor.updatePvpStatus()
 		return
diff --git a/src/resources/objects/creature/CreatureMessageBuilder.java b/src/resources/objects/creature/CreatureMessageBuilder.java
index d569d834..5ebafb62 100644
--- a/src/resources/objects/creature/CreatureMessageBuilder.java
+++ b/src/resources/objects/creature/CreatureMessageBuilder.java
@@ -362,8 +362,11 @@ public class CreatureMessageBuilder extends ObjectMessageBuilder {
 			PlayerObject player = (PlayerObject) creature.getSlottedObject("ghost");
 			
 			for(Buff buff : creature.getBuffList().get()) {
-					
-				buff.setTotalPlayTime((int) (player.getTotalPlayTime() + (System.currentTimeMillis() - player.getLastPlayTimeUpdate()) / 1000));
+				
+				if(player != null)
+					buff.setTotalPlayTime((int) (player.getTotalPlayTime() + (System.currentTimeMillis() - player.getLastPlayTimeUpdate()) / 1000));
+				else 
+					buff.setTotalPlayTime(0);
 				buffer.put((byte) 1);
 				buffer.putInt(0);
 				buffer.putInt(CRC.StringtoCRC(buff.getBuffName()));
@@ -777,7 +780,10 @@ public class CreatureMessageBuilder extends ObjectMessageBuilder {
 		IoBuffer buffer = bufferPool.allocate(37, false).order(ByteOrder.LITTLE_ENDIAN);
 		buffer.putInt(1);
 		buffer.putInt(creature.getBuffListCounter());
-		buff.setTotalPlayTime((int) (player.getTotalPlayTime() + (System.currentTimeMillis() - player.getLastPlayTimeUpdate()) / 1000));
+		if(player != null)
+			buff.setTotalPlayTime((int) (player.getTotalPlayTime() + (System.currentTimeMillis() - player.getLastPlayTimeUpdate()) / 1000));
+		else
+			buff.setTotalPlayTime(0);
 		buffer.put((byte) 0);
 		buffer.put(buff.getBytes());
 		int size = buffer.position();
@@ -813,7 +819,10 @@ public class CreatureMessageBuilder extends ObjectMessageBuilder {
 		IoBuffer buffer = bufferPool.allocate(37, false).order(ByteOrder.LITTLE_ENDIAN);
 		buffer.putInt(1);
 		buffer.putInt(creature.getBuffListCounter());
-		buff.setTotalPlayTime((int) (player.getTotalPlayTime() + (System.currentTimeMillis() - player.getLastPlayTimeUpdate()) / 1000));
+		if(player != null)
+			buff.setTotalPlayTime((int) (player.getTotalPlayTime() + (System.currentTimeMillis() - player.getLastPlayTimeUpdate()) / 1000));
+		else
+			buff.setTotalPlayTime(0);
 		buffer.put((byte) 2);
 		buffer.put(buff.getBytes());
 		int size = buffer.position();
diff --git a/src/services/combat/CombatService.java b/src/services/combat/CombatService.java
index 6a237772..6115344a 100644
--- a/src/services/combat/CombatService.java
+++ b/src/services/combat/CombatService.java
@@ -193,7 +193,15 @@ public class CombatService implements INetworkDispatch {
 					creature.removeDefender(defender);
 				}	
 			}
-		}	
+		}
+		else if(target instanceof TangibleObject)
+		{
+			if(target.getConditionDamage() == target.getMaxDamage()) 
+			{
+				for(TangibleObject defender : target.getDefendersList()) defender.removeDefender(target);
+				core.objectService.destroyObject(target);
+			}
+		}
 	}
 
 	private void doAreaCombat(CreatureObject attacker, TangibleObject target, WeaponObject weapon, CombatCommand command, int actionCounter) {