diff --git a/src/main/java/noppes/npcs/controllers/ScriptController.java b/src/main/java/noppes/npcs/controllers/ScriptController.java
index 9f9c96604..bfdc56f45 100644
--- a/src/main/java/noppes/npcs/controllers/ScriptController.java
+++ b/src/main/java/noppes/npcs/controllers/ScriptController.java
@@ -56,14 +56,16 @@ public class ScriptController {
 		Instance = this;
 		manager = new ScriptEngineManager();
 		LogWriter.info("Script Engines Available:");
+
+		ScriptEngine engine = manager.getEngineByName("nashorn");
+		if (engine != null) {
+			this.nashornFactory = engine.getFactory();
+		}
+
 		for(ScriptEngineFactory fac : manager.getEngineFactories()){
 			if(fac.getExtensions().isEmpty())
 				continue;
 
-			if (fac.getEngineName().equals("Oracle Nashorn")) {
-				this.nashornFactory = fac;
-			}
-
 			ScriptEngine scriptEngine = fac.getScriptEngine();
 			try {
 				scriptEngine.put("$RunTest",null);