diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiser.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiser.java
index 4ba3bb62dce9..f3e51470f44a 100644
--- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiser.java
+++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiser.java
@@ -249,12 +249,14 @@ public class PluginsAdvertiser implements StartupActivity {
 
       @Override
       public void onSuccess() {
-        final PluginsAdvertiserDialog advertiserDialog =
-          new PluginsAdvertiserDialog(null,
-                                      myPlugins.toArray(new PluginDownloader[myPlugins.size()]),
-                                      PluginManagerMain.mapToPluginIds(myAllPlugins));
-        if (advertiserDialog.showAndGet()) {
-          onSuccess.run();
+        if (myAllPlugins != null) {
+          final PluginsAdvertiserDialog advertiserDialog =
+            new PluginsAdvertiserDialog(null,
+                                        myPlugins.toArray(new PluginDownloader[myPlugins.size()]),
+                                        PluginManagerMain.mapToPluginIds(myAllPlugins));
+          if (advertiserDialog.showAndGet()) {
+            onSuccess.run();
+          }
         }
       }
     });