diff --git a/platform/util/src/com/intellij/openapi/util/ShutDownTracker.java b/platform/util/src/com/intellij/openapi/util/ShutDownTracker.java
index 33df1651babe..35cacacd5065 100644
--- a/platform/util/src/com/intellij/openapi/util/ShutDownTracker.java
+++ b/platform/util/src/com/intellij/openapi/util/ShutDownTracker.java
@@ -77,14 +77,15 @@ public class ShutDownTracker implements Runnable {
         LOG.error(e);
       }
     }
-    
-    
-    for (Thread thread = myShutdownThreads.removeLast(); thread != null; thread = myShutdownThreads.removeLast()) {
-      thread.start();
-      try {
-        thread.join();
-      }
-      catch (InterruptedException ignored) {
+
+    if (!myShutdownThreads.isEmpty()) {
+      for (Thread thread = myShutdownThreads.removeLast(); thread != null; thread = myShutdownThreads.removeLast()) {
+        thread.start();
+        try {
+          thread.join();
+        }
+        catch (InterruptedException ignored) {
+        }
       }
     }
   }