1 files changed, 4 insertions, 1 deletions
diff --git a/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/ExtensionFactory.java b/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/ExtensionFactory.java
index b95d10d1a7..7edb2db06f 100644
--- a/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/ExtensionFactory.java
+++ b/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/ExtensionFactory.java
@@ -34,7 +34,10 @@ public abstract class ExtensionFactory implements Iterable<Class<? extends Exten
         availableExtensions = new HashMap<>();
         for (Extension ext : extensionLoader)
         {
-            availableExtensions.put(ext.getName(),ext.getClass());
+            if (ext != null)
+            {
+                availableExtensions.put(ext.getName(),ext.getClass());
+            }
         }
     }