diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/InstalledPluginsTableModel.java b/platform/platform-impl/src/com/intellij/ide/plugins/InstalledPluginsTableModel.java
index 0bc4b1ff33ed..f550aaac0de2 100644
--- a/platform/platform-impl/src/com/intellij/ide/plugins/InstalledPluginsTableModel.java
+++ b/platform/platform-impl/src/com/intellij/ide/plugins/InstalledPluginsTableModel.java
@@ -105,7 +105,7 @@ public class InstalledPluginsTableModel extends PluginTableModel {
     return false;
   }
 
-  public static void updateExistingPlugin(IdeaPluginDescriptor descriptor, IdeaPluginDescriptor existing) {
+  public static void updateExistingPlugin(IdeaPluginDescriptor descriptor, @Nullable IdeaPluginDescriptor existing) {
     if (existing != null) {
       updateExistingPluginInfo(descriptor, existing);
       updatedPlugins.add(existing.getPluginId());
diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java
index 30ce19603e6d..f76079ccd92d 100644
--- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java
+++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java
@@ -601,14 +601,16 @@ public final class UpdateChecker {
     boolean installed = false;
     for (PluginDownloader downloader : downloaders) {
       if (getDisabledToUpdatePlugins().contains(downloader.getPluginId())) continue;
-      try {
-        final IdeaPluginDescriptor descriptor = downloader.getDescriptor();
-        InstalledPluginsTableModel.updateExistingPlugin(descriptor, PluginManager.getPlugin(descriptor.getPluginId()));
-        downloader.install();
-        installed = true;
-      }
-      catch (IOException e) {
-        LOG.info(e);
+      final IdeaPluginDescriptor descriptor = downloader.getDescriptor();
+      if (descriptor != null) {
+        try {
+          InstalledPluginsTableModel.updateExistingPlugin(descriptor, PluginManager.getPlugin(descriptor.getPluginId()));
+          downloader.install();
+          installed = true;
+        }
+        catch (IOException e) {
+          LOG.info(e);
+        }
       }
     }
     return installed;