diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/L2AttackableAIScript.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/L2AttackableAIScript.java
index 27e2e96935db81362e9cc6d17ce7b94454836fc3..2a2cb3f5b28e3d8e1b9c315286e1677c9be0892c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/L2AttackableAIScript.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/L2AttackableAIScript.java
@@ -175,13 +175,10 @@ public final class L2AttackableAIScript extends QuestJython
 		if (npc instanceof L2MonsterInstance)
 		{
 			final L2MonsterInstance mob = (L2MonsterInstance) npc;
-			if (mob.getLeader() != null)
+			if (mob.getLeader() != null && mob.getLeader().hasMinions())
 			{
-				final int respawnTime = Config.MINIONS_RESPAWN_TIME.containsKey(npc.getNpcId()) ? Config.MINIONS_RESPAWN_TIME.get(mob.getNpcId()) * 1000 : -1;
-				if (mob.hasMinions())
-				{
-					mob.getLeader().getMinionList().onMinionDie(mob, respawnTime);
-				}
+				final int respawnTime = Config.MINIONS_RESPAWN_TIME.containsKey(npc.getNpcId()) ? Config.MINIONS_RESPAWN_TIME.get(mob.getNpcId()) * 1000 : -1;	
+				mob.getLeader().getMinionList().onMinionDie(mob, respawnTime);
 			}
 			
 			if (mob.hasMinions())
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Craft.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Craft.java
index e755f5de76caf9cc261928880e647056802a87c3..e447de5a235bf6fda908849ee0d32ca931bd2516 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Craft.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Craft.java
@@ -47,7 +47,7 @@ public class Craft implements ISkillHandler
 			player.sendPacket(SystemMessageId.CANNOT_CREATED_WHILE_ENGAGED_IN_TRADING);
 			return;
 		}
-		RecipeController.getInstance().requestBookOpen(player, (skill.getSkillType() == L2SkillType.DWARVEN_CRAFT) ? true : false);
+		RecipeController.getInstance().requestBookOpen(player, (skill.getSkillType() == L2SkillType.DWARVEN_CRAFT));
 	}
 	
 	@Override