From 4af34daf984332ceaf03b215b5e51e7fcaafbf01 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Tue, 22 May 2012 16:23:24 +0400
Subject: [PATCH] NPE

---
 .../intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
index 1e0b36dfadcf..de48dedf80fe 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
@@ -548,7 +548,9 @@ public void addMessageToConsoleWindow(final String message, final TextAttributes
   public VcsShowConfirmationOption getStandardConfirmation(@NotNull VcsConfiguration.StandardConfirmation option,
                                                            AbstractVcs vcs) {
     final VcsShowConfirmationOptionImpl result = getConfirmation(option);
-    result.addApplicableVcs(vcs);
+    if (vcs != null) {
+      result.addApplicableVcs(vcs);
+    }
     return result;
   }