diff --git a/core/src/main/java/hudson/ExtensionList.java b/core/src/main/java/hudson/ExtensionList.java index c3f408c4777ca3ced9451299c738b7e91e4e2b06..6cbdd051dfe6750f5e84cd83d5ec009b264c01d2 100644 --- a/core/src/main/java/hudson/ExtensionList.java +++ b/core/src/main/java/hudson/ExtensionList.java @@ -309,7 +309,7 @@ public class ExtensionList extends AbstractList implements OnMaster { private List> ensureLoaded() { if(extensions!=null) return extensions; // already loaded - if (jenkins.getInitLevel().compareTo(InitMilestone.PLUGINS_PREPARED)<0) + if (jenkins == null || jenkins.getInitLevel().compareTo(InitMilestone.PLUGINS_PREPARED) < 0) return legacyInstances; // can't perform the auto discovery until all plugins are loaded, so just make the legacy instances visible synchronized (getLoadLock()) {