diff --git a/src/resources/objects/Buff.java b/src/resources/objects/Buff.java
index eb207a33..2b8b4725 100644
--- a/src/resources/objects/Buff.java
+++ b/src/resources/objects/Buff.java
@@ -430,7 +430,7 @@ public class Buff implements IDelta {
 	}
 	
 	public boolean isGroupBuff() {
-		return effect1Name.equals("group");
+		return effect1Name == null ? false : effect1Name.equals("group");
 	}
 
 	public long getGroupBufferId() {
diff --git a/src/services/SimulationService.java b/src/services/SimulationService.java
index 5acb77dd..4d7f9cd5 100644
--- a/src/services/SimulationService.java
+++ b/src/services/SimulationService.java
@@ -748,7 +748,7 @@ public class SimulationService implements INetworkDispatch {
 		if(!ghost.isSet(PlayerFlags.LD))
 			ghost.toggleFlag(PlayerFlags.LD);
 		
-		for (CreatureObject opponent : object.getDuelList()) {
+		for (CreatureObject opponent : new ArrayList<CreatureObject>(object.getDuelList())) {
 			if (opponent != null) {
 				core.combatService.handleEndDuel(object, opponent, true);
 			}