diff --git a/scripts/mobiles/dantooine/dark_jedi_master.py b/scripts/mobiles/dantooine/dark_jedi_master.py
index 6d6566ae..8596f272 100644
--- a/scripts/mobiles/dantooine/dark_jedi_master.py
+++ b/scripts/mobiles/dantooine/dark_jedi_master.py
@@ -41,6 +41,32 @@ def addTemplate(core):
 	attacks = Vector()
 	mobileTemplate.setDefaultAttack('saberHit')
 	mobileTemplate.setAttacks(attacks)
+
+
+	lootPoolNames_1 = ['Junk']
+	lootPoolChances_1 = [100]
+	lootGroupChance_1 = 65
+	mobileTemplate.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1)
+	
+	lootPoolNames_2 = ['jedi_relic_1']
+	lootPoolChances_2 = [100]
+	lootGroupChance_2 = 85
+	mobileTemplate.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2)
+	
+	lootPoolNames_3 = ['powercrystals_hiq']
+	lootPoolChances_3 = [100]
+	lootGroupChance_3 = 12
+	mobileTemplate.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3)
+	
+	lootPoolNames_4 = ['random_stat_jewelry']
+	lootPoolChances_4 = [100]
+	lootGroupChance_4 = 8
+	mobileTemplate.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4)
+
+	lootPoolNames_5 = ['sithholocrons']
+	lootPoolChances_5 = [100]
+	lootGroupChance_5 = 3
+	mobileTemplate.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5)
 	
 	core.spawnService.addMobileTemplate('dark_jedi_master', mobileTemplate)
 	
\ No newline at end of file
diff --git a/src/services/spawn/MobileTemplate.java b/src/services/spawn/MobileTemplate.java
index 1d31bb5a..5c67f195 100644
--- a/src/services/spawn/MobileTemplate.java
+++ b/src/services/spawn/MobileTemplate.java
@@ -21,6 +21,7 @@
  ******************************************************************************/
 package services.spawn;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Vector;
 
@@ -59,7 +60,7 @@ public class MobileTemplate implements Cloneable {
 	private String meatType, milkType, boneType, hideType;
 	private int meatAmount, milkAmount, boneAmount, hideAmount;
 	private int respawnTime = 0;
-	private List<LootGroup> lootGroups;
+	private List<LootGroup> lootGroups = new ArrayList<LootGroup>();
 
 	
 	public Vector<String> getTemplates() {
diff --git a/src/services/spawn/SpawnService.java b/src/services/spawn/SpawnService.java
index 18d66938..22c6a1f2 100644
--- a/src/services/spawn/SpawnService.java
+++ b/src/services/spawn/SpawnService.java
@@ -100,7 +100,7 @@ public class SpawnService {
 			creature.setWeaponId(mobileTemplate.getCustomWeapon().getObjectID());
 		}*/
 		
-		if(mobileTemplate.getLootGroups() != null)
+		if(mobileTemplate.getLootGroups() != null && !mobileTemplate.getLootGroups().isEmpty())
 			creature.setLootGroups(mobileTemplate.getLootGroups());
 		
 		creature.setOptionsBitmask(mobileTemplate.getOptionsBitmask());
@@ -118,7 +118,7 @@ public class SpawnService {
 			level = mobileTemplate.getLevel();
 		}
 		
-		if (mobileTemplate.getMinLevel()!=0 && mobileTemplate.getMaxLevel()!=0){
+		if (mobileTemplate.getMinLevel()!=0 && mobileTemplate.getMaxLevel()!=0 && level == -1){
 			level = (short) (mobileTemplate.getMinLevel() + (new Random().nextInt(mobileTemplate.getMaxLevel()-mobileTemplate.getMinLevel()))); 
 			creature.setLevel(level);
 		}