--- a/src/java.scripting/share/classes/javax/script/ScriptEngineManager.java	Thu Feb 15 19:35:17 2018 -0800
+++ b/src/java.scripting/share/classes/javax/script/ScriptEngineManager.java	Fri Feb 16 15:23:22 2018 +0530
@@ -77,7 +77,10 @@
 
     private void init(final ClassLoader loader) {
         globalScope = new SimpleBindings();
-        engineSpis = new TreeSet<ScriptEngineFactory>(Comparator.comparing(ScriptEngineFactory::getEngineName));
+        engineSpis = new TreeSet<ScriptEngineFactory>(Comparator.comparing(
+            ScriptEngineFactory::getEngineName,
+            Comparator.nullsLast(Comparator.naturalOrder()))
+        );
         nameAssociations = new HashMap<String, ScriptEngineFactory>();
         extensionAssociations = new HashMap<String, ScriptEngineFactory>();
         mimeTypeAssociations = new HashMap<String, ScriptEngineFactory>();