diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 88f9b70e081..17bf849277c 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -143,6 +143,8 @@ Other Changes
 
 * SOLR-12535: Solr no longer accepts index time boosts in JSON provided to Solr. (David Smiley)
 
+* SOLR-13086: Improve the error message reported by DocumentObjectBinder when a setter is not found (Gus Heck)
+
 ==================  7.7.0 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
@@ -228,6 +230,9 @@ Other Changes
 
 * SOLR-12727: Upgrade ZooKeeper dependency to 3.4.13 (Kevin Risden, Erick Erickson, Cao Manh Dat)
 
+* SOLR-13086: Improve the error message reported by DocumentObjectBinder when a setter is not found (Gus Heck)
+
+
 ==================  7.6.0 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java b/solr/solrj/src/java/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java
index e2e65bb89e5..2e7809323d6 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java
@@ -232,7 +232,8 @@ public class DocumentObjectBinder {
       } else {
         Class[] params = setter.getParameterTypes();
         if (params.length != 1) {
-          throw new BindingException("Invalid setter method. Must have one and only one parameter");
+          throw new BindingException("Invalid setter method (" + setter +
+              "). A setter must have one and only one parameter but we found " + params.length + " parameters.");
         }
         type = params[0];
       }