diff --git a/extensions/source/com/intellij/openapi/extensions/EPAvailabilityListenerExtension.java b/extensions/source/com/intellij/openapi/extensions/EPAvailabilityListenerExtension.java index a6aa18b76f0f..e93df438cce4 100644 --- a/extensions/source/com/intellij/openapi/extensions/EPAvailabilityListenerExtension.java +++ b/extensions/source/com/intellij/openapi/extensions/EPAvailabilityListenerExtension.java @@ -47,7 +47,7 @@ public class EPAvailabilityListenerExtension implements PluginAware { } public Class loadListenerClass() throws ClassNotFoundException { - if (myPluginDescriptor.getPluginClassLoader() != null) { + if (myPluginDescriptor != null && myPluginDescriptor.getPluginClassLoader() != null) { return Class.forName(getListenerClass(), true, myPluginDescriptor.getPluginClassLoader()); } else {