diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index a6d3e00d55..eb848a61a1 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -50,6 +50,8 @@ This means, you can use CPD to find duplicated code in your Kotlin projects.
 *   java-design
     *   [#1151](https://github.com/pmd/pmd/issues/1151): \[java] ImmutableField false positive with multiple constructors
     *   [#1483](https://github.com/pmd/pmd/issues/1483): \[java] Cyclo metric should count conditions of for statements correctly
+*   java-errorprone
+    *   [#1512](https://github.com/pmd/pmd/issues/1512): \[java] InvalidSlf4jMessageFormatRule causes NPE in lambda and static blocks
 *   plsql
     *   [#1454](https://github.com/pmd/pmd/issues/1454): \[plsql] ParseException for IF/CASE statement with >=, <=, !=
 
@@ -246,6 +248,7 @@ removal:
 *   [#1464](https://github.com/pmd/pmd/pull/1464): \[doc] Fix XSS on documentation web page - [Maxime Robert](https://github.com/marob)
 *   [#1469](https://github.com/pmd/pmd/pull/1469): \[core] Configurable max loops in DAAPathFinder - [Alberto Fernández](https://github.com/albfernandez)
 *   [#1494](https://github.com/pmd/pmd/pull/1494): \[java] 1151: Rephrase ImmutableField documentation in design.xml - [Robbie Martinus](https://github.com/rmartinus)
+*   [#1504](https://github.com/pmd/pmd/pull/1504): \[java] NPE in InvalidSlf4jMessageFormatRule if a logger call with a variable as parameter is not inside a method or constructor - [kris-scheibe](https://github.com/kris-scheibe)
 
 {% endtocmaker %}
 
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/InvalidSlf4jMessageFormat.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/InvalidSlf4jMessageFormat.xml
index 9df5189f19..994de283ab 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/InvalidSlf4jMessageFormat.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/InvalidSlf4jMessageFormat.xml
@@ -271,7 +271,7 @@ public final class Main {
     </test-code>
 
     <test-code>
-        <description>NPE in static block</description>
+        <description>NPE in static block (see #1512)</description>
         <expected-problems>0</expected-problems>
         <code><![CDATA[
             import org.slf4j.Logger;
@@ -304,7 +304,7 @@ public final class Main {
     </test-code>
 
     <test-code>
-        <description>NPE in lambda call</description>
+        <description>NPE in lambda call (see #1512)</description>
         <expected-problems>0</expected-problems>
         <code><![CDATA[
             import org.slf4j.Logger;