diff --git a/scm-core/src/main/java/sonia/scm/repository/AbstactImportHandler.java b/scm-core/src/main/java/sonia/scm/repository/AbstactImportHandler.java
index 2da506674d..958280a39b 100644
--- a/scm-core/src/main/java/sonia/scm/repository/AbstactImportHandler.java
+++ b/scm-core/src/main/java/sonia/scm/repository/AbstactImportHandler.java
@@ -105,13 +105,7 @@ public abstract class AbstactImportHandler implements AdvancedImportHandler
     {
       return doRepositoryImport(manager, false);
     }
-    catch (IOException ex)
-    {
-
-      // should never happen
-      throw Throwables.propagate(ex);
-    }
-    catch (RepositoryException ex)
+    catch (IOException | RepositoryException ex)
     {
 
       // should never happen
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgHookManager.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgHookManager.java
index aa0e4156ae..2814cedb32 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgHookManager.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgHookManager.java
@@ -36,31 +36,21 @@ package sonia.scm.repository;
 //~--- non-JDK imports --------------------------------------------------------
 
 import com.github.legman.Subscribe;
-
 import com.google.common.base.Objects;
-import com.google.inject.Inject;
-import com.google.inject.OutOfScopeException;
-import com.google.inject.Provider;
-import com.google.inject.ProvisionException;
-import com.google.inject.Singleton;
-
+import com.google.inject.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import sonia.scm.config.ScmConfiguration;
-
+import sonia.scm.config.ScmConfigurationChangedEvent;
+import sonia.scm.net.ahc.AdvancedHttpClient;
 import sonia.scm.util.HttpUtil;
 import sonia.scm.util.Util;
 
-//~--- JDK imports ------------------------------------------------------------
-
+import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
-
 import java.util.UUID;
 
-import javax.servlet.http.HttpServletRequest;
-import sonia.scm.config.ScmConfigurationChangedEvent;
-import sonia.scm.net.ahc.AdvancedHttpClient;
+//~--- JDK imports ------------------------------------------------------------
 
 /**
  *
@@ -331,11 +321,7 @@ public class HgHookManager
     {
       request = httpServletRequestProvider.get();
     }
-    catch (ProvisionException ex)
-    {
-      logger.debug("http servlet request is not available");
-    }
-    catch (OutOfScopeException ex)
+    catch (ProvisionException | OutOfScopeException ex)
     {
       logger.debug("http servlet request is not available");
     }
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgCGIServlet.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgCGIServlet.java
index be7118323c..32478f6203 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgCGIServlet.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgCGIServlet.java
@@ -39,20 +39,12 @@ import com.google.common.base.Stopwatch;
 import com.google.common.base.Strings;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
-
+import com.sun.jersey.core.util.Base64;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import sonia.scm.SCMContext;
 import sonia.scm.config.ScmConfiguration;
-import sonia.scm.repository.HgConfig;
-import sonia.scm.repository.HgEnvironment;
-import sonia.scm.repository.HgHookManager;
-import sonia.scm.repository.HgPythonScript;
-import sonia.scm.repository.HgRepositoryHandler;
-import sonia.scm.repository.Repository;
-import sonia.scm.repository.RepositoryProvider;
-import sonia.scm.repository.RepositoryRequestListenerUtil;
+import sonia.scm.repository.*;
 import sonia.scm.security.CipherUtil;
 import sonia.scm.util.AssertUtil;
 import sonia.scm.util.HttpUtil;
@@ -60,20 +52,16 @@ import sonia.scm.web.cgi.CGIExecutor;
 import sonia.scm.web.cgi.CGIExecutorFactory;
 import sonia.scm.web.cgi.EnvList;
 
-//~--- JDK imports ------------------------------------------------------------
-
-import com.sun.jersey.core.util.Base64;
-
-import java.io.File;
-import java.io.IOException;
-
-import java.util.Enumeration;
-
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+import java.io.File;
+import java.io.IOException;
+import java.util.Enumeration;
+
+//~--- JDK imports ------------------------------------------------------------
 
 /**
  *
@@ -186,11 +174,7 @@ public class HgCGIServlet extends HttpServlet
       {
         handleRequest(request, response, repository);
       }
-      catch (ServletException ex)
-      {
-        exceptionHandler.handleException(request, response, ex);
-      }
-      catch (IOException ex)
+      catch (ServletException | IOException ex)
       {
         exceptionHandler.handleException(request, response, ex);
       }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java
index 728c935fc1..d6bb92d233 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java
@@ -285,15 +285,10 @@ public class RepositoryImportResource
       service = serviceFactory.create(repository);
       service.getPullCommand().pull(request.getUrl());
     }
-    catch (RepositoryException ex)
+    catch (RepositoryException | IOException ex)
     {
       handleImportFailure(ex, repository);
-    }
-    catch (IOException ex)
-    {
-      handleImportFailure(ex, repository);
-    }
-    finally
+    } finally
     {
       IOUtil.close(service);
     }
@@ -437,12 +432,7 @@ public class RepositoryImportResource
               .concat(type), ex);
         response = Response.status(Status.BAD_REQUEST).build();
       }
-      catch (IOException ex)
-      {
-        logger.warn("exception occured durring directory import", ex);
-        response = Response.serverError().build();
-      }
-      catch (RepositoryException ex)
+      catch (IOException | RepositoryException ex)
       {
         logger.warn("exception occured durring directory import", ex);
         response = Response.serverError().build();
@@ -561,11 +551,7 @@ public class RepositoryImportResource
 
       throw new WebApplicationException(Response.Status.CONFLICT);
     }
-    catch (RepositoryException ex)
-    {
-      handleGenericCreationFailure(ex, type, name);
-    }
-    catch (IOException ex)
+    catch (RepositoryException | IOException ex)
     {
       handleGenericCreationFailure(ex, type, name);
     }
@@ -615,15 +601,10 @@ public class RepositoryImportResource
         service = serviceFactory.create(repository);
         service.getUnbundleCommand().setCompressed(compressed).unbundle(file);
       }
-      catch (RepositoryException ex)
+      catch (RepositoryException | IOException ex)
       {
         handleImportFailure(ex, repository);
-      }
-      catch (IOException ex)
-      {
-        handleImportFailure(ex, repository);
-      }
-      finally
+      } finally
       {
         IOUtil.close(service);
         IOUtil.delete(file);
@@ -717,11 +698,7 @@ public class RepositoryImportResource
     {
       manager.delete(repository);
     }
-    catch (IOException e)
-    {
-      logger.error("can not delete repository", e);
-    }
-    catch (RepositoryException e)
+    catch (IOException | RepositoryException e)
     {
       logger.error("can not delete repository", e);
     }
@@ -772,11 +749,7 @@ public class RepositoryImportResource
       {
         throw new WebApplicationException(ex, Response.Status.BAD_REQUEST);
       }
-      catch (IOException ex)
-      {
-        throw new WebApplicationException(ex);
-      }
-      catch (RepositoryException ex)
+      catch (IOException | RepositoryException ex)
       {
         throw new WebApplicationException(ex);
       }
diff --git a/scm-webapp/src/main/java/sonia/scm/net/ahc/DefaultAdvancedHttpClient.java b/scm-webapp/src/main/java/sonia/scm/net/ahc/DefaultAdvancedHttpClient.java
index df6c93515b..161abf54c6 100644
--- a/scm-webapp/src/main/java/sonia/scm/net/ahc/DefaultAdvancedHttpClient.java
+++ b/scm-webapp/src/main/java/sonia/scm/net/ahc/DefaultAdvancedHttpClient.java
@@ -38,39 +38,27 @@ import com.google.common.base.Strings;
 import com.google.common.collect.Multimap;
 import com.google.common.io.Closeables;
 import com.google.inject.Inject;
-
 import org.apache.shiro.codec.Base64;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import sonia.scm.config.ScmConfiguration;
 import sonia.scm.net.Proxies;
 import sonia.scm.net.TrustAllHostnameVerifier;
 import sonia.scm.net.TrustAllTrustManager;
 import sonia.scm.util.HttpUtil;
 
-//~--- JDK imports ------------------------------------------------------------
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import java.net.HttpURLConnection;
-import java.net.InetSocketAddress;
-import java.net.ProtocolException;
-import java.net.Proxy;
-import java.net.SocketAddress;
-import java.net.URL;
-
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
-
-import java.util.Set;
 import javax.inject.Provider;
-
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.*;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.util.Set;
+
+//~--- JDK imports ------------------------------------------------------------
 
 /**
  * Default implementation of the {@link AdvancedHttpClient}. The default
@@ -324,11 +312,7 @@ public class DefaultAdvancedHttpClient extends AdvancedHttpClient
         sc.init(null, trustAllCerts, new java.security.SecureRandom());
         connection.setSSLSocketFactory(sc.getSocketFactory());
       }
-      catch (KeyManagementException ex)
-      {
-        logger.error("could not disable certificate validation", ex);
-      }
-      catch (NoSuchAlgorithmException ex)
+      catch (KeyManagementException | NoSuchAlgorithmException ex)
       {
         logger.error("could not disable certificate validation", ex);
       }
diff --git a/scm-webapp/src/main/java/sonia/scm/net/ahc/XmlContentTransformer.java b/scm-webapp/src/main/java/sonia/scm/net/ahc/XmlContentTransformer.java
index 84dcda3593..71fbb489b1 100644
--- a/scm-webapp/src/main/java/sonia/scm/net/ahc/XmlContentTransformer.java
+++ b/scm-webapp/src/main/java/sonia/scm/net/ahc/XmlContentTransformer.java
@@ -34,20 +34,17 @@ package sonia.scm.net.ahc;
 //~--- non-JDK imports --------------------------------------------------------
 
 import com.google.common.io.ByteSource;
-
 import sonia.scm.plugin.Extension;
 import sonia.scm.util.IOUtil;
 
-//~--- JDK imports ------------------------------------------------------------
-
+import javax.ws.rs.core.MediaType;
+import javax.xml.bind.DataBindingException;
+import javax.xml.bind.JAXB;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import javax.ws.rs.core.MediaType;
-
-import javax.xml.bind.DataBindingException;
-import javax.xml.bind.JAXB;
+//~--- JDK imports ------------------------------------------------------------
 
 /**
  * {@link ContentTransformer} for xml. The {@link XmlContentTransformer} uses 
@@ -96,15 +93,10 @@ public class XmlContentTransformer implements ContentTransformer
       stream = content.openBufferedStream();
       object = JAXB.unmarshal(stream, type);
     }
-    catch (IOException ex)
+    catch (IOException | DataBindingException ex)
     {
       throw new ContentTransformerException("could not unmarshall content", ex);
-    }
-    catch (DataBindingException ex)
-    {
-      throw new ContentTransformerException("could not unmarshall content", ex);
-    }
-    finally
+    } finally
     {
       IOUtil.close(stream);
     }