diff --git a/reference/dom/domxpath/evaluate.xml b/reference/dom/domxpath/evaluate.xml
index 1f8a240bd94f..3bb738c0b789 100644
--- a/reference/dom/domxpath/evaluate.xml
+++ b/reference/dom/domxpath/evaluate.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="domxpath.evaluate" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="domxpath.evaluate" xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude">
  <refnamediv>
   <refname>DOMXPath::evaluate</refname>
   <refpurpose>
@@ -46,6 +46,7 @@
    </variablelist>
   </para>
  </refsect1>
+ <xi:include xpointer="domxpath.query..errors" />
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/dom/domxpath/query.xml b/reference/dom/domxpath/query.xml
index 071d1e9685c9..f6640d97af6e 100644
--- a/reference/dom/domxpath/query.xml
+++ b/reference/dom/domxpath/query.xml
@@ -59,6 +59,35 @@
    <methodname>DOMXPath::query</methodname> returns &false;.
   </para>
  </refsect1>
+ <refsect1 role="errors" xml:id="domxpath.query..errors">
+  &reftitle.errors;
+  <simpara>
+   The following errors are possible when using an expression that invokes
+   PHP callbacks.
+  </simpara>
+  <itemizedlist>
+   <listitem>
+    <simpara>
+     Throws an <exceptionname>Error</exceptionname> if
+     a PHP callback is invoked but there were no callbacks registered,
+     or if the named callback was not registered.
+    </simpara>
+   </listitem>
+   <listitem>
+    <simpara>
+     Throws a <exceptionname>TypeError</exceptionname> if
+     the <literal>php:function</literal> syntax is used and the handler
+     name is not a string.
+    </simpara>
+   </listitem>
+   <listitem>
+    <simpara>
+     Throws an <exceptionname>Error</exceptionname> if
+     a non-DOM object was returned from a callback.
+    </simpara>
+   </listitem>
+  </itemizedlist>
+ </refsect1>
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
diff --git a/reference/dom/domxpath/registerphpfunctionns.xml b/reference/dom/domxpath/registerphpfunctionns.xml
index 238a8e4333a2..0643d6ff5cdd 100644
--- a/reference/dom/domxpath/registerphpfunctionns.xml
+++ b/reference/dom/domxpath/registerphpfunctionns.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="domxpath.registerphpfunctionns" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="domxpath.registerphpfunctionns" xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude">
  <refnamediv>
   <refname>DOMXPath::registerPhpFunctionNS</refname>
   <refpurpose>Register a PHP functions as namespaced XPath function</refpurpose>
@@ -53,6 +53,8 @@
   </variablelist>
  </refsect1>
 
+ <xi:include xpointer="domxpath.registerphpfunctions..errors" />
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
diff --git a/reference/dom/domxpath/registerphpfunctions.xml b/reference/dom/domxpath/registerphpfunctions.xml
index 997e954a98f1..ea9f5dbb22ff 100644
--- a/reference/dom/domxpath/registerphpfunctions.xml
+++ b/reference/dom/domxpath/registerphpfunctions.xml
@@ -48,6 +48,25 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors" xml:id="domxpath.registerphpfunctions..errors">
+  &reftitle.errors;
+  <itemizedlist>
+   <listitem>
+    <simpara>
+     Throws a <exceptionname>ValueError</exceptionname> if
+     a callback name is not valid.
+    </simpara>
+   </listitem>
+   &dom.errors.compliant.common;
+   <listitem>
+    <simpara>
+     Throws a <exceptionname>TypeError</exceptionname> if
+     a given callback is not callable.
+    </simpara>
+   </listitem>
+  </itemizedlist>
+ </refsect1>
+
  <refsect1 role="changelog">
   &reftitle.changelog;
   <informaltable>
@@ -59,6 +78,15 @@
      </row>
     </thead>
     <tbody>
+     <row xml:id="domxpath.registerphpfunctions..changelog.errors">
+      <entry>8.4.0</entry>
+      <entry>
+       Invalid callback names now throws a
+       <exceptionname>ValueError</exceptionname>.
+       Passing a non-callable entry now throws a
+       <exceptionname>TypeError</exceptionname>.
+      </entry>
+     </row>
      <row>
       <entry>8.4.0</entry>
       <entry>
diff --git a/reference/xsl/xsltprocessor/registerphpfunctionns.xml b/reference/xsl/xsltprocessor/registerphpfunctionns.xml
index 89f9334f1cc3..df832b453c22 100644
--- a/reference/xsl/xsltprocessor/registerphpfunctionns.xml
+++ b/reference/xsl/xsltprocessor/registerphpfunctionns.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="xsltprocessor.registerphpfunctionns" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="xsltprocessor.registerphpfunctionns" xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude">
  <refnamediv>
   <refname>XSLTProcessor::registerPHPFunctionNS</refname>
   <refpurpose>Register a PHP function as namespaced XSLT function</refpurpose>
@@ -50,6 +50,8 @@
   </variablelist>
  </refsect1>
 
+ <xi:include xpointer="domxpath.registerphpfunctions..errors" />
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <simpara>
diff --git a/reference/xsl/xsltprocessor/registerphpfunctions.xml b/reference/xsl/xsltprocessor/registerphpfunctions.xml
index 2b89bf17748d..adb53a29ab41 100644
--- a/reference/xsl/xsltprocessor/registerphpfunctions.xml
+++ b/reference/xsl/xsltprocessor/registerphpfunctions.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="xsltprocessor.registerphpfunctions" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="xsltprocessor.registerphpfunctions" xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude">
  <refnamediv>
   <refname>XSLTProcessor::registerPHPFunctions</refname>
   <refpurpose>Enables the ability to use PHP functions as XSLT functions</refpurpose>
@@ -40,6 +40,8 @@
   </para>
  </refsect1>
 
+ <xi:include xpointer="domxpath.registerphpfunctions..errors" />
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -58,6 +60,7 @@
      </row>
     </thead>
     <tbody>
+     <xi:include xpointer="domxpath.registerphpfunctions..changelog.errors" />
      <row>
       <entry>8.4.0</entry>
       <entry>
diff --git a/reference/xsl/xsltprocessor/transformtodoc.xml b/reference/xsl/xsltprocessor/transformtodoc.xml
index 61839e3063b9..655db25fa642 100644
--- a/reference/xsl/xsltprocessor/transformtodoc.xml
+++ b/reference/xsl/xsltprocessor/transformtodoc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="xsltprocessor.transformtodoc" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="xsltprocessor.transformtodoc" xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude">
  <refnamediv>
   <refname>XSLTProcessor::transformToDoc</refname>
   <refpurpose>Transform to a document</refpurpose>
@@ -45,6 +45,9 @@
    </variablelist>
   </para>
  </refsect1>
+
+ <xi:include xpointer="domxpath.query..errors" />
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -52,27 +55,7 @@
   </para>
  </refsect1>
 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>8.4.0</entry>
-      <entry>
-       Added support for <classname>Dom\Document</classname>.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
+ <xi:include xpointer="xsltprocessor.transformtouri..changelog" />
 
  <refsect1 role="examples">
   &reftitle.examples;
diff --git a/reference/xsl/xsltprocessor/transformtouri.xml b/reference/xsl/xsltprocessor/transformtouri.xml
index 550daecad4a4..71174c747458 100644
--- a/reference/xsl/xsltprocessor/transformtouri.xml
+++ b/reference/xsl/xsltprocessor/transformtouri.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="xsltprocessor.transformtouri" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="xsltprocessor.transformtouri" xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude">
  <refnamediv>
   <refname>XSLTProcessor::transformToUri</refname>
   <refpurpose>Transform to URI</refpurpose>
@@ -42,6 +42,8 @@
   </para>
  </refsect1>
 
+ <xi:include xpointer="domxpath.query..errors" />
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -49,7 +51,7 @@
   </para>
  </refsect1>
 
- <refsect1 role="changelog">
+ <refsect1 role="changelog" xml:id="xsltprocessor.transformtouri..changelog">
   &reftitle.changelog;
   <informaltable>
    <tgroup cols="2">
@@ -60,6 +62,13 @@
      </row>
     </thead>
     <tbody>
+     <row>
+      <entry>8.4.0</entry>
+      <entry>
+       Now throws an <exceptionname>Error</exceptionname> if the callback
+       cannot be invoked, instead of emitting a warning.
+      </entry>
+     </row>
      <row>
       <entry>8.4.0</entry>
       <entry>
diff --git a/reference/xsl/xsltprocessor/transformtoxml.xml b/reference/xsl/xsltprocessor/transformtoxml.xml
index 94a7c830e4d1..798380e55511 100644
--- a/reference/xsl/xsltprocessor/transformtoxml.xml
+++ b/reference/xsl/xsltprocessor/transformtoxml.xml
@@ -21,6 +21,9 @@
    <xi:fallback/>
   </xi:include>
  </refsect1>
+
+ <xi:include xpointer="domxpath.query..errors" />
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -28,27 +31,7 @@
   </para>
  </refsect1>
 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>8.4.0</entry>
-      <entry>
-       Added support for <classname>Dom\Document</classname>.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
+ <xi:include xpointer="xsltprocessor.transformtouri..changelog" />
 
  <refsect1 role="examples">
   &reftitle.examples;