diff --git a/nge.cfg b/nge.cfg
index 036d6202..6d4d88df 100644
--- a/nge.cfg
+++ b/nge.cfg
@@ -13,4 +13,5 @@ GALAXY_ID=2
 GALAXY_NAME=Local Connection
 XPMULTIPLIER=1.0
 MAXNUMBEROFCHARACTERS=2
+LOAD.RESOURCE.SYSTEM=1
 MOTD=Welcome to PSWG Test Center!
\ No newline at end of file
diff --git a/src/main/NGECore.java b/src/main/NGECore.java
index af8330a3..0762507f 100644
--- a/src/main/NGECore.java
+++ b/src/main/NGECore.java
@@ -301,8 +301,11 @@ public class NGECore {
 		spawnService = new SpawnService(this);
 		aiService = new AIService(this);
 		//missionService = new MissionService(this);
-		surveyService = new SurveyService(this);
-		resourceService = new ResourceService(this);
+		
+		if (config.getInt("LOAD.RESOURCE.SYSTEM") == 1) {
+			surveyService = new SurveyService(this);
+			resourceService = new ResourceService(this);
+		}
 		
 		// Ping Server
 		try {
@@ -403,8 +406,10 @@ public class NGECore {
 		
 		objectService.loadBuildings();
 		
-		objectService.loadResourceRoots();
-		objectService.loadResources();
+		if (config.getInt("LOAD.RESOURCE.SYSTEM") == 1) {
+			objectService.loadResourceRoots();
+			objectService.loadResources();
+		}
 		
 		terrainService.loadSnapShotObjects();
 		objectService.loadServerTemplates();
diff --git a/src/services/PlayerService.java b/src/services/PlayerService.java
index f355b367..c9d7dcd2 100644
--- a/src/services/PlayerService.java
+++ b/src/services/PlayerService.java
@@ -718,14 +718,20 @@ public class PlayerService implements INetworkDispatch {
 									String[] wookieeItems = ((String) roadmap.getObject(s, 5)).split(",");
 									String[] ithorianItems = ((String) roadmap.getObject(s, 6)).split(",");
 									
-									for (int n = 0; n < items.length; n++) {
+									int arrayLength = items.length;
+									
+									if (wookieeItems.length > 0 && creature.getStfName().contains("wookiee"))
+										arrayLength = wookieeItems.length;
+									else if (ithorianItems.length > 0 && creature.getStfName().contains("ithorian"))
+										arrayLength = ithorianItems.length;
+
+									for (int n = 0; n < arrayLength; n++) {
 										String item = items[n];
 										
-										if (wookieeItems[0].length() > 0 && creature.getStfName().contains("wookiee")) {
+										if (creature.getStfName().contains("wookiee"))
 											item = wookieeItems[n];
-										} else if (ithorianItems[0].length() > 0 && creature.getStfName().contains("ithorian")) {
+										else if (creature.getStfName().contains("ithorian"))
 											item = ithorianItems[n];
-										}
 										
 										try {
 											String customServerTemplate = null;