diff --git a/logbook-servlet/src/main/java/org/zalando/logbook/servlet/HttpFilter.java b/logbook-servlet/src/main/java/org/zalando/logbook/servlet/HttpFilter.java
index b8bd433ab..cfd56eae6 100644
--- a/logbook-servlet/src/main/java/org/zalando/logbook/servlet/HttpFilter.java
+++ b/logbook-servlet/src/main/java/org/zalando/logbook/servlet/HttpFilter.java
@@ -30,7 +30,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
-import static com.google.common.base.Preconditions.checkArgument;
+import static java.lang.String.format;
 
 interface HttpFilter extends Filter {
 
@@ -43,8 +43,13 @@ default void init(final FilterConfig filterConfig) throws ServletException {
     default void doFilter(final ServletRequest request, final ServletResponse response,
             final FilterChain chain) throws ServletException, IOException {
 
-        checkArgument(request instanceof HttpServletRequest, "%s only supports HTTP", getClass().getSimpleName());
-        checkArgument(response instanceof HttpServletResponse, "%s only supports HTTP", getClass().getSimpleName());
+        if (!(request instanceof HttpServletRequest)) {
+          throw new IllegalArgumentException(format("%s only supports HTTP", getClass().getSimpleName()));
+        }
+
+        if (!(response instanceof HttpServletResponse)) {
+          throw new IllegalArgumentException(format("%s only supports HTTP", getClass().getSimpleName()));
+        }
 
         final HttpServletRequest httpRequest = (HttpServletRequest) request;
         final HttpServletResponse httpResponse = (HttpServletResponse) response;
diff --git a/logbook-test/src/main/java/org/zalando/logbook/MockHttpMessage.java b/logbook-test/src/main/java/org/zalando/logbook/MockHttpMessage.java
index fcfbf3a33..f971a97b0 100644
--- a/logbook-test/src/main/java/org/zalando/logbook/MockHttpMessage.java
+++ b/logbook-test/src/main/java/org/zalando/logbook/MockHttpMessage.java
@@ -24,13 +24,13 @@
 
 import javax.annotation.Nullable;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
 
 interface MockHttpMessage {
 
     default  <K, V> ListMultimap<K, V> firstNonNullNorEmpty(@Nullable final ListMultimap<K, V> first,
             final ListMultimap<K, V> second) {
-        return first != null && !first.isEmpty() ? first : checkNotNull(second);
+        return first != null && !first.isEmpty() ? first : requireNonNull(second);
     }
 
 }