diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/protocolcommand/git/BaseReceivePackFactory.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/protocolcommand/git/BaseReceivePackFactory.java
new file mode 100644
index 0000000000..4fc3a5415c
--- /dev/null
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/protocolcommand/git/BaseReceivePackFactory.java
@@ -0,0 +1,42 @@
+package sonia.scm.protocolcommand.git;
+
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.transport.ReceivePack;
+import org.eclipse.jgit.transport.resolver.ReceivePackFactory;
+import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException;
+import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException;
+import sonia.scm.repository.GitRepositoryHandler;
+import sonia.scm.repository.spi.HookEventFacade;
+import sonia.scm.web.CollectingPackParserListener;
+import sonia.scm.web.GitReceiveHook;
+
+public abstract class BaseReceivePackFactory<T> implements ReceivePackFactory<T> {
+
+  private final GitRepositoryHandler handler;
+  private final GitReceiveHook hook;
+
+  protected BaseReceivePackFactory(GitRepositoryHandler handler, HookEventFacade hookEventFacade) {
+    this.handler = handler;
+    this.hook = new GitReceiveHook(hookEventFacade, handler);
+  }
+
+  @Override
+  public final ReceivePack create(T connection, Repository repository) throws ServiceNotAuthorizedException, ServiceNotEnabledException {
+    ReceivePack receivePack = createBasicReceivePack(connection, repository);
+    receivePack.setAllowNonFastForwards(isNonFastForwardAllowed());
+
+    receivePack.setPreReceiveHook(hook);
+    receivePack.setPostReceiveHook(hook);
+    // apply collecting listener, to be able to check which commits are new
+    CollectingPackParserListener.set(receivePack);
+
+    return receivePack;
+  }
+
+  protected abstract ReceivePack createBasicReceivePack(T request, Repository repository)
+    throws ServiceNotEnabledException, ServiceNotAuthorizedException;
+
+  private boolean isNonFastForwardAllowed() {
+    return ! handler.getConfig().isNonFastForwardDisallowed();
+  }
+}
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/protocolcommand/git/GitSshProtocol.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/protocolcommand/git/GitSshProtocol.java
index c80127f1a7..df4ae99553 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/protocolcommand/git/GitSshProtocol.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/protocolcommand/git/GitSshProtocol.java
@@ -5,6 +5,8 @@ import org.eclipse.jgit.lib.RepositoryCache;
 import org.eclipse.jgit.transport.ReceivePack;
 import org.eclipse.jgit.transport.RemoteConfig;
 import org.eclipse.jgit.transport.UploadPack;
+import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException;
+import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException;
 import org.eclipse.jgit.util.FS;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -49,6 +51,8 @@ public class GitSshProtocol implements ScmSshProtocol {
     try (Repository repository = open(repositoryContext)) {
       ReceivePack receivePack = receivePackFactory.create(repositoryContext, repository);
       receivePack.receive(commandContext.getInputStream(), commandContext.getOutputStream(), commandContext.getErrorStream());
+    } catch (ServiceNotEnabledException | ServiceNotAuthorizedException e) {
+      throw new IOException("error creating receive pack for ssh", e);
     }
   }
 
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/protocolcommand/git/SshReceivePackFactory.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/protocolcommand/git/SshReceivePackFactory.java
index 819b92ca27..18bf1968d5 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/protocolcommand/git/SshReceivePackFactory.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/protocolcommand/git/SshReceivePackFactory.java
@@ -3,42 +3,19 @@ package sonia.scm.protocolcommand.git;
 import com.google.inject.Inject;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.transport.ReceivePack;
-import org.eclipse.jgit.transport.resolver.ReceivePackFactory;
 import sonia.scm.protocolcommand.RepositoryContext;
 import sonia.scm.repository.GitRepositoryHandler;
 import sonia.scm.repository.spi.HookEventFacade;
-import sonia.scm.web.CollectingPackParserListener;
-import sonia.scm.web.GitReceiveHook;
 
-/**
- * TODO we should have a single/abstract ReceivePackFactory for http and ssh.
- */
-public class SshReceivePackFactory implements ReceivePackFactory<RepositoryContext> {
-
-  private final GitRepositoryHandler handler;
-  private final GitReceiveHook hook;
+public class SshReceivePackFactory extends BaseReceivePackFactory<RepositoryContext> {
 
   @Inject
   public SshReceivePackFactory(GitRepositoryHandler handler, HookEventFacade hookEventFacade) {
-    this.handler = handler;
-    this.hook = new GitReceiveHook(hookEventFacade, handler);
+    super(handler, hookEventFacade);
   }
 
   @Override
-  public ReceivePack create(RepositoryContext repositoryContext, Repository repository) {
-    ReceivePack receivePack = new ReceivePack(repository);
-    receivePack.setAllowNonFastForwards(isNonFastForwardAllowed());
-
-    receivePack.setPreReceiveHook(hook);
-    receivePack.setPostReceiveHook(hook);
-
-    // apply collecting listener, to be able to check which commits are new
-    CollectingPackParserListener.set(receivePack);
-
-    return receivePack;
-  }
-
-  private boolean isNonFastForwardAllowed() {
-    return ! handler.getConfig().isNonFastForwardDisallowed();
+  protected ReceivePack createBasicReceivePack(RepositoryContext repositoryContext, Repository repository) {
+    return new ReceivePack(repository);
   }
 }
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitReceivePackFactory.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitReceivePackFactory.java
index 5cb8007986..d6e7f398d4 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitReceivePackFactory.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitReceivePackFactory.java
@@ -43,6 +43,7 @@ import org.eclipse.jgit.transport.ReceivePack;
 import org.eclipse.jgit.transport.resolver.ReceivePackFactory;
 import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException;
 import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException;
+import sonia.scm.protocolcommand.git.BaseReceivePackFactory;
 import sonia.scm.repository.GitRepositoryHandler;
 import sonia.scm.repository.spi.HookEventFacade;
 
@@ -56,38 +57,21 @@ import javax.servlet.http.HttpServletRequest;
  *
  * @author Sebastian Sdorra
  */
-public class GitReceivePackFactory implements ReceivePackFactory<HttpServletRequest>
+public class GitReceivePackFactory extends BaseReceivePackFactory<HttpServletRequest>
 {
 
-  private final GitRepositoryHandler handler;
-
-  private ReceivePackFactory wrapped;
-
-  private final GitReceiveHook hook;
+  private ReceivePackFactory<HttpServletRequest> wrapped;
 
   @Inject
   public GitReceivePackFactory(GitRepositoryHandler handler, HookEventFacade hookEventFacade) {
-    this.handler = handler;
-    this.hook = new GitReceiveHook(hookEventFacade, handler);
-    this.wrapped =  new DefaultReceivePackFactory();
+    super(handler, hookEventFacade);
+    this.wrapped = new DefaultReceivePackFactory();
   }
 
   @Override
-  public ReceivePack create(HttpServletRequest request, Repository repository)
+  protected ReceivePack createBasicReceivePack(HttpServletRequest request, Repository repository)
     throws ServiceNotEnabledException, ServiceNotAuthorizedException {
-    ReceivePack receivePack = wrapped.create(request, repository);
-    receivePack.setAllowNonFastForwards(isNonFastForwardAllowed());
-
-    receivePack.setPreReceiveHook(hook);
-    receivePack.setPostReceiveHook(hook);
-    // apply collecting listener, to be able to check which commits are new
-    CollectingPackParserListener.set(receivePack);
-    
-    return receivePack;
-  }
-
-  private boolean isNonFastForwardAllowed() {
-    return ! handler.getConfig().isNonFastForwardDisallowed();
+    return wrapped.create(request, repository);
   }
 
   @VisibleForTesting