diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/BaseMergeTask.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/BaseMergeTask.java
index c72ec0a7e3f1..57a61773c8f0 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/BaseMergeTask.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/BaseMergeTask.java
@@ -119,14 +119,9 @@ public abstract class BaseMergeTask extends TaskDescriptor {
 
   @CalledInAny
   protected void end(@NotNull VcsException e) {
-    end(myMergeContext.getTitle(), e);
-  }
-
-  @CalledInAny
-  protected void end(@NotNull String message, @NotNull VcsException e) {
-    LOG.info(message, e);
+    LOG.info(e);
 
     end();
-    getApplication().invokeLater(() -> myInteraction.showErrors(message, singletonList(e)));
+    getApplication().invokeLater(() -> myInteraction.showErrors(myMergeContext.getTitle(), singletonList(e)));
   }
 }
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/LookForBranchOriginTask.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/LookForBranchOriginTask.java
index c83ee77feaed..2df954e1d0c0 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/LookForBranchOriginTask.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/LookForBranchOriginTask.java
@@ -35,24 +35,18 @@ public class LookForBranchOriginTask extends BaseMergeTask {
   }
 
   @Override
-  public void run() {
+  public void run() throws VcsException {
     SVNURL repoUrl = myMergeContext.getWcInfo().getRootInfo().getRepositoryUrlUrl();
     String sourceUrl = myFromSource ? myMergeContext.getSourceUrl() : myMergeContext.getWcInfo().getRootUrl();
     String targetUrl = myFromSource ? myMergeContext.getWcInfo().getRootUrl() : myMergeContext.getSourceUrl();
+    SvnBranchPointsCalculator.WrapperInvertor copyPoint =
+      myMergeContext.getVcs().getSvnBranchPointsCalculator().calculateCopyPoint(repoUrl, sourceUrl, targetUrl);
 
-    try {
-      SvnBranchPointsCalculator.WrapperInvertor copyPoint =
-        myMergeContext.getVcs().getSvnBranchPointsCalculator().calculateCopyPoint(repoUrl, sourceUrl, targetUrl);
-
-      if (copyPoint != null) {
-        myCallback.consume(copyPoint);
-      }
-      else {
-        end("Merge start wasn't found", true);
-      }
+    if (copyPoint != null) {
+      myCallback.consume(copyPoint);
     }
-    catch (VcsException e) {
-      end("Merge start wasn't found", e);
+    else {
+      end("Merge start wasn't found", true);
     }
   }
 }
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/MergeAllWithBranchCopyPointTask.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/MergeAllWithBranchCopyPointTask.java
index ded9ea4616bf..df53809ce585 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/MergeAllWithBranchCopyPointTask.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/MergeAllWithBranchCopyPointTask.java
@@ -42,10 +42,7 @@ public class MergeAllWithBranchCopyPointTask extends BaseMergeTask {
   public void run() {
     boolean reintegrate = myCopyPoint != null && myCopyPoint.isInvertedSense();
 
-    if (reintegrate && !myInteraction.shouldReintegrate(myCopyPoint.inverted().getTarget())) {
-      end();
-    }
-    else {
+    if (!reintegrate || myInteraction.shouldReintegrate(myCopyPoint.inverted().getTarget())) {
       MergerFactory mergerFactory = createBranchMergerFactory(reintegrate);
       String title = "Merging all from " + myMergeContext.getBranchName() + (reintegrate ? " (reintegrate)" : "");
 
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ShowRevisionSelector.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ShowRevisionSelector.java
index 128bfc5d30e3..b4d3d9551a48 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ShowRevisionSelector.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ShowRevisionSelector.java
@@ -48,15 +48,15 @@ public class ShowRevisionSelector extends BaseMergeTask {
       myInteraction.selectMergeItems(myChangeLists, myMergeChecker, myAllStatusesCalculated, myAllListsLoaded);
 
     switch (result.getResultCode()) {
-      case cancel:
-        end();
-        break;
       case all:
         mergeAll(true);
         break;
-      default:
+      case select:
+      case showLatest:
         merge(result.getSelectedLists());
         break;
+      case cancel:
+        break;
     }
   }
 }