diff --git a/README.md b/README.md
index 44bc969..e50125c 100644
--- a/README.md
+++ b/README.md
@@ -15,3 +15,8 @@ The following is a plugin for Atlassian Stash to provide repository mirroring to
 Full documentation is always available at:
 
 https://developer.atlassian.com/display/DOCS/Introduction+to+the+Atlassian+Plugin+SDK
+
+
+
+The plugin can be found on the Atlassian Marketplace here:
+https://marketplace.atlassian.com/plugins/com.englishtown.stash-hook-mirror
diff --git a/pom.xml b/pom.xml
index 4ed6f71..1f0dbb8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.englishtown</groupId>
     <artifactId>stash-hook-mirror</artifactId>
-    <version>1.4.0</version>
+    <version>1.5.0</version>
 
     <organization>
         <name>Englishtown</name>
@@ -65,10 +65,6 @@
             <version>${slf4j.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>com.atlassian.stash</groupId>
-            <artifactId>stash-scm-git</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.atlassian.stash</groupId>
             <artifactId>stash-api</artifactId>
@@ -100,6 +96,7 @@
             <artifactId>commons-lang</artifactId>
             <version>${common-lang.version}</version>
         </dependency>
+
         <!-- WIRED TEST RUNNER DEPENDENCIES -->
         <dependency>
             <groupId>com.atlassian.stash</groupId>
diff --git a/src/main/java/com/englishtown/stash/hook/MirrorRepositoryHook.java b/src/main/java/com/englishtown/stash/hook/MirrorRepositoryHook.java
index 460f908..c8eccf7 100644
--- a/src/main/java/com/englishtown/stash/hook/MirrorRepositoryHook.java
+++ b/src/main/java/com/englishtown/stash/hook/MirrorRepositoryHook.java
@@ -5,10 +5,10 @@ import com.atlassian.sal.api.pluginsettings.PluginSettingsFactory;
 import com.atlassian.stash.hook.repository.AsyncPostReceiveRepositoryHook;
 import com.atlassian.stash.hook.repository.RepositoryHookContext;
 import com.atlassian.stash.i18n.I18nService;
-import com.atlassian.stash.internal.scm.git.GitCommandExitHandler;
 import com.atlassian.stash.repository.RefChange;
 import com.atlassian.stash.repository.Repository;
 import com.atlassian.stash.scm.CommandExitHandler;
+import com.atlassian.stash.scm.DefaultCommandExitHandler;
 import com.atlassian.stash.scm.git.GitScm;
 import com.atlassian.stash.scm.git.GitScmCommandBuilder;
 import com.atlassian.stash.setting.RepositorySettingsValidator;
@@ -18,6 +18,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.annotation.Nonnull;
+import java.lang.reflect.Method;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.*;
@@ -111,8 +112,7 @@ public class MirrorRepositoryHook implements AsyncPostReceiveRepositoryHook, Rep
                 public Void call() throws Exception {
                     try {
                         GitScmCommandBuilder builder = gitScm.getCommandBuilderFactory().builder(repository);
-                        CommandExitHandler exitHandler = new GitCommandExitHandler(i18nService, repository);
-                        PasswordHandler passwordHandler = new PasswordHandler(password, exitHandler);
+                        PasswordHandler passwordHandler = getPasswordHandler(builder, password);
 
                         // Call push command with the prune flag and refspecs for heads and tags
                         // Do not use the mirror flag as pull-request refs are included
@@ -130,12 +130,12 @@ public class MirrorRepositoryHook implements AsyncPostReceiveRepositoryHook, Rep
                         logger.debug("MirrorRepositoryHook: postReceive completed with result '{}'.", result);
 
                     } catch (Exception e) {
-                        if (++attempts > MAX_ATTEMPTS) {
-                            logger.error("Failed to mirror repository " + repository.getName() + " after " + --attempts
+                        if (++attempts >= MAX_ATTEMPTS) {
+                            logger.error("Failed to mirror repository " + repository.getName() + " after " + attempts
                                     + " attempts.", e);
                         } else {
                             logger.warn("Failed to mirror repository " + repository.getName() + ", " +
-                                    "retrying in 1 minute.");
+                                    "retrying in 1 minute (attempt {} of {}).", attempts, MAX_ATTEMPTS);
                             executor.schedule(this, 1, TimeUnit.MINUTES);
                         }
                     }
@@ -306,4 +306,20 @@ public class MirrorRepositoryHook implements AsyncPostReceiveRepositoryHook, Rep
 
     }
 
+    protected PasswordHandler getPasswordHandler(GitScmCommandBuilder builder, String password) {
+
+        try {
+            Method method = builder.getClass().getDeclaredMethod("createExitHandler");
+            method.setAccessible(true);
+            CommandExitHandler exitHandler = (CommandExitHandler) method.invoke(builder);
+
+            return new PasswordHandler(password, exitHandler);
+
+        } catch (Throwable t) {
+            logger.warn("Unable to create exit handler", t);
+        }
+
+        return new PasswordHandler(password, new DefaultCommandExitHandler(i18nService));
+    }
+
 }
diff --git a/src/test/java/com/englishtown/stash/hook/MirrorRepositoryHookTest.java b/src/test/java/com/englishtown/stash/hook/MirrorRepositoryHookTest.java
index b59db33..a60ea6a 100644
--- a/src/test/java/com/englishtown/stash/hook/MirrorRepositoryHookTest.java
+++ b/src/test/java/com/englishtown/stash/hook/MirrorRepositoryHookTest.java
@@ -149,12 +149,11 @@ public class MirrorRepositoryHookTest {
         callable = argumentCaptor.getValue();
         callable.call();
 
-        verify(executor, times(5)).schedule(argumentCaptor.capture(), anyInt(), any(TimeUnit.class));
-        callable = argumentCaptor.getValue();
-        callable.call();
-
         // Make sure it is only called 5 times
-        verify(executor, times(5)).schedule(argumentCaptor.capture(), anyInt(), any(TimeUnit.class));
+        callable.call();
+        callable.call();
+        callable.call();
+        verify(executor, times(4)).schedule(argumentCaptor.capture(), anyInt(), any(TimeUnit.class));
 
     }