diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ShortDiffDetails.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ShortDiffDetails.java
index f02da16a136d..5c30d2039e35 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ShortDiffDetails.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ShortDiffDetails.java
@@ -198,7 +198,9 @@ public class ShortDiffDetails implements RefreshablePanel, Disposable {
     if (myDetailsLoader != null) {
       Disposer.dispose(myDetailsLoader);
     }
-    myDetailsPanel.clear();
+    if (myDetailsPanel != null) {
+      myDetailsPanel.clear();
+    }
     myDetailsCache.clear();
   }