diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/AetherDependencyFilter.java b/scm-webapp/src/main/java/sonia/scm/plugin/AetherDependencyFilter.java
index b2e8d94f1c..6895dea9fa 100644
--- a/scm-webapp/src/main/java/sonia/scm/plugin/AetherDependencyFilter.java
+++ b/scm-webapp/src/main/java/sonia/scm/plugin/AetherDependencyFilter.java
@@ -35,6 +35,8 @@ package sonia.scm.plugin;
 
 //~--- non-JDK imports --------------------------------------------------------
 
+import com.google.common.io.Closeables;
+
 import org.sonatype.aether.artifact.Artifact;
 import org.sonatype.aether.graph.DependencyFilter;
 import org.sonatype.aether.graph.DependencyNode;
@@ -109,7 +111,7 @@ public class AetherDependencyFilter implements DependencyFilter
     try
     {
       scanner = new Scanner(
-          AetherDependencyFilter.class.getResourceAsStream(EXCLUDE_LIST));
+        AetherDependencyFilter.class.getResourceAsStream(EXCLUDE_LIST));
 
       while (scanner.hasNextLine())
       {
@@ -118,7 +120,7 @@ public class AetherDependencyFilter implements DependencyFilter
     }
     finally
     {
-      scanner.close();
+      Closeables.closeQuietly(scanner);
     }
   }
 
diff --git a/scm-webapp/src/main/java/sonia/scm/util/DebugServlet.java b/scm-webapp/src/main/java/sonia/scm/util/DebugServlet.java
index 86a329a04b..bd6d558094 100644
--- a/scm-webapp/src/main/java/sonia/scm/util/DebugServlet.java
+++ b/scm-webapp/src/main/java/sonia/scm/util/DebugServlet.java
@@ -29,10 +29,13 @@
  *
  */
 
+
+
 package sonia.scm.util;
 
 //~--- non-JDK imports --------------------------------------------------------
 
+import com.google.common.io.Closeables;
 import com.google.inject.Singleton;
 
 //~--- JDK imports ------------------------------------------------------------
@@ -74,7 +77,7 @@ public class DebugServlet extends HttpServlet
    */
   @Override
   protected void doGet(HttpServletRequest request, HttpServletResponse response)
-          throws ServletException, IOException
+    throws ServletException, IOException
   {
     processRequest(request, response);
   }
@@ -91,8 +94,8 @@ public class DebugServlet extends HttpServlet
    */
   @Override
   protected void doPost(HttpServletRequest request,
-                        HttpServletResponse response)
-          throws ServletException, IOException
+    HttpServletResponse response)
+    throws ServletException, IOException
   {
     processRequest(request, response);
   }
@@ -160,7 +163,7 @@ public class DebugServlet extends HttpServlet
    * @param session
    */
   private void appendSessionAttributes(PrintWriter writer,
-          final HttpSession session)
+    final HttpSession session)
   {
     writer.append("<h2>Session Attributes</h2>");
     appendAttributes(writer, new AttributeContext()
@@ -213,8 +216,8 @@ public class DebugServlet extends HttpServlet
    * @throws ServletException
    */
   private void processRequest(HttpServletRequest request,
-                              HttpServletResponse response)
-          throws ServletException, IOException
+    HttpServletResponse response)
+    throws ServletException, IOException
   {
     PrintWriter writer = null;
 
@@ -232,7 +235,7 @@ public class DebugServlet extends HttpServlet
     }
     finally
     {
-      writer.close();
+      Closeables.closeQuietly(writer);
     }
   }