diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java b/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
index 0d4c79a30a51..56023d8c7d0e 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
@@ -326,8 +326,12 @@ public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableCo
       // real document content will be cleared on next flush;
       myContentSize = 0;
       myBuffer.clear();
-      myHyperlinks.clearHyperlinks();
       myFolding.clear();
+
+      final EditorHyperlinkSupport hyperlinks = myHyperlinks;
+      if (hyperlinks != null) {
+        hyperlinks.clearHyperlinks();
+      }
     }
     if (myFlushAlarm.isDisposed()) return;
     cancelAllFlushRequests();