diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolder.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolder.java
index bbc096b13..0d524f79a 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolder.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolder.java
@@ -40,6 +40,13 @@ import java.util.Map;
  */
 public class SuppressWarningsHolder
     extends Check {
+
+    /**
+     * A key is pointing to the warning message text in "messages.properties"
+     * file.
+     */
+    public static final String MSG_KEY = "suppress.warnings.invalid.target";
+
     /**
      * Optional prefix for warning suppressions that are only intended to be
      * recognized by checkstyle. For instance, to suppress {@code
@@ -244,7 +251,7 @@ public class SuppressWarningsHolder
 
 
             if (targetAST == null) {
-                log(ast, "suppress.warnings.invalid.target");
+                log(ast.getLineNo(), MSG_KEY);
                 return;
             }
 
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/messages.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/messages.properties
index 4f0498ec5..e90b13959 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/messages.properties
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/messages.properties
@@ -28,3 +28,5 @@ properties.duplicateproperty=Duplicated property ''{0}'' ({1} occurrence(s)).
 unable.open.cause=Unable to open ''{0}'': {1}.
 
 forbid.escaped.unicode.char=Unicode escape(s) usage should be avoided.
+
+suppress.warnings.invalid.target=Invalid target for @SuppressWarnings.