diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/Slf4jLogDeclaration.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/Slf4jLogDeclaration.java
index 6efcbab7b1..7c57fdf5dc 100644
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/Slf4jLogDeclaration.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/Slf4jLogDeclaration.java
@@ -1,6 +1,6 @@
 package tech.picnic.errorprone.bugpatterns;
 
-import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
 import static com.google.errorprone.BugPattern.LinkType.CUSTOM;
 import static com.google.errorprone.BugPattern.SeverityLevel.WARNING;
 import static com.google.errorprone.BugPattern.StandardTags.STYLE;
@@ -114,7 +114,7 @@ private static void updateGetLoggerArgument(
       matcher = CLASS_ARGUMENT_PATTERN.matcher(argumentName);
     }
 
-    checkArgument(matcher.matches(), "Invalid argument name.");
+    checkState(matcher.matches());
     String argumentClassName = matcher.group(1);
     if (!className.contentEquals(argumentClassName)) {
       fixBuilder.merge(
diff --git a/error-prone-contrib/src/test/java/tech/picnic/errorprone/bugpatterns/Slf4jLogDeclarationTest.java b/error-prone-contrib/src/test/java/tech/picnic/errorprone/bugpatterns/Slf4jLogDeclarationTest.java
index 4baf9b39ea..6f67a2a16b 100644
--- a/error-prone-contrib/src/test/java/tech/picnic/errorprone/bugpatterns/Slf4jLogDeclarationTest.java
+++ b/error-prone-contrib/src/test/java/tech/picnic/errorprone/bugpatterns/Slf4jLogDeclarationTest.java
@@ -20,13 +20,17 @@ void identification() {
             "",
             "  private static final Logger LOG = LoggerFactory.getLogger(A.class);",
             "",
-            "  // BUG: Diagnostic contains:",
-            "  private static final Logger foo = LoggerFactory.getLogger(A.class);",
-            "",
             "  static class OverloadedGetLogger {",
             "    private static final Logger LOG = LoggerFactory.getLogger(\"OverloadedGetLogger\");",
             "  }",
             "",
+            "  interface InterfaceWithNoCanonicalModifiers {",
+            "    Logger LOG = LoggerFactory.getLogger(InterfaceWithNoCanonicalModifiers.class);",
+            "  }",
+            "",
+            "  // BUG: Diagnostic contains:",
+            "  private static final Logger foo = LoggerFactory.getLogger(A.class);",
+            "",
             "  static class WrongOverloadedGetLogger {",
             "    // BUG: Diagnostic contains:",
             "    private static final Logger LOG = LoggerFactory.getLogger(\"OverloadedGetLogger\");",
@@ -62,10 +66,6 @@ void identification() {
             "    private static final Logger LOG = LoggerFactory.getLogger(String.class);",
             "  }",
             "",
-            "  interface InterfaceWithNoCanonicalModifiers {",
-            "    Logger LOG = LoggerFactory.getLogger(InterfaceWithNoCanonicalModifiers.class);",
-            "  }",
-            "",
             "  interface InterfaceWithWrongVariableName {",
             "    // BUG: Diagnostic contains:",
             "    Logger BAZ = LoggerFactory.getLogger(InterfaceWithWrongVariableName.class);",
@@ -106,7 +106,6 @@ void replacement() {
             "  }",
             "",
             "  static class WrongArgumentOverloadedGetLogger {",
-            "    // BUG: Diagnostic contains:",
             "    private static final Logger LOG = LoggerFactory.getLogger(\"OverloadedGetLogger\");",
             "  }",
             "",
@@ -140,7 +139,6 @@ void replacement() {
             "  }",
             "",
             "  static class WrongArgumentOverloadedGetLogger {",
-            "    // BUG: Diagnostic contains:",
             "    private static final Logger LOG = LoggerFactory.getLogger(\"WrongArgumentOverloadedGetLogger\");",
             "  }",
             "",