diff --git a/src/final-JATS-schematron.sch b/src/final-JATS-schematron.sch
index fa7e49e6f0..935075d596 100644
--- a/src/final-JATS-schematron.sch
+++ b/src/final-JATS-schematron.sch
@@ -1634,7 +1634,7 @@
       <let name="name" value="e:get-name(name[1])"/>
       <let name="role" value="role[1]"/>
       <let name="author-contribs" value="ancestor::article-meta/contrib-group[1]/contrib[@contrib-type='author']"/>
-      <let name="matching-author-names" value="for $contrib in $author-contribs where (e:get-name($contrib)=$name) return e:get-name($contrib)"/>
+      <let name="matching-author-names" value="for $contrib in $author-contribs return if (e:get-name($contrib)=$name) then e:get-name($contrib) else ()"/>
       
       <report test="(@contrib-type='senior_editor') and ($role!='Senior Editor')" role="error" id="editor-conformance-3">[editor-conformance-3] <value-of select="$name"/> has a @contrib-type='senior_editor' but their role is not 'Senior Editor' (<value-of select="$role"/>), which is incorrect.</report>
       
diff --git a/src/final-JATS-schematron.xsl b/src/final-JATS-schematron.xsl
index 475eba7111..4b0e0a06d4 100644
--- a/src/final-JATS-schematron.xsl
+++ b/src/final-JATS-schematron.xsl
@@ -7842,7 +7842,7 @@
       <xsl:variable name="name" select="e:get-name(name[1])"/>
       <xsl:variable name="role" select="role[1]"/>
       <xsl:variable name="author-contribs" select="ancestor::article-meta/contrib-group[1]/contrib[@contrib-type='author']"/>
-      <xsl:variable name="matching-author-names" select="for $contrib in $author-contribs where (e:get-name($contrib)=$name) return e:get-name($contrib)"/>
+      <xsl:variable name="matching-author-names" select="for $contrib in $author-contribs return if (e:get-name($contrib)=$name) then e:get-name($contrib) else ()"/>
 
 		    <!--REPORT error-->
       <xsl:if test="(@contrib-type='senior_editor') and ($role!='Senior Editor')">
diff --git a/src/final-package-JATS-schematron.sch b/src/final-package-JATS-schematron.sch
index a2b74ec65e..50eda33434 100644
--- a/src/final-package-JATS-schematron.sch
+++ b/src/final-package-JATS-schematron.sch
@@ -1640,7 +1640,7 @@
       <let name="name" value="e:get-name(name[1])"/>
       <let name="role" value="role[1]"/>
       <let name="author-contribs" value="ancestor::article-meta/contrib-group[1]/contrib[@contrib-type='author']"/>
-      <let name="matching-author-names" value="for $contrib in $author-contribs where (e:get-name($contrib)=$name) return e:get-name($contrib)"/>
+      <let name="matching-author-names" value="for $contrib in $author-contribs return if (e:get-name($contrib)=$name) then e:get-name($contrib) else ()"/>
       
       <report test="(@contrib-type='senior_editor') and ($role!='Senior Editor')" role="error" id="editor-conformance-3"><value-of select="$name"/> has a @contrib-type='senior_editor' but their role is not 'Senior Editor' (<value-of select="$role"/>), which is incorrect.</report>
       
diff --git a/src/pre-JATS-schematron.sch b/src/pre-JATS-schematron.sch
index 6c65f9e4dc..f157ec4343 100644
--- a/src/pre-JATS-schematron.sch
+++ b/src/pre-JATS-schematron.sch
@@ -1579,7 +1579,7 @@
       <let name="name" value="e:get-name(name[1])"/>
       <let name="role" value="role[1]"/>
       <let name="author-contribs" value="ancestor::article-meta/contrib-group[1]/contrib[@contrib-type='author']"/>
-      <let name="matching-author-names" value="for $contrib in $author-contribs where (e:get-name($contrib)=$name) return e:get-name($contrib)"/>
+      <let name="matching-author-names" value="for $contrib in $author-contribs return if (e:get-name($contrib)=$name) then e:get-name($contrib) else ()"/>
       
       <report test="(@contrib-type='senior_editor') and ($role!='Senior Editor')" role="error" id="editor-conformance-3">[editor-conformance-3] <value-of select="$name"/> has a @contrib-type='senior_editor' but their role is not 'Senior Editor' (<value-of select="$role"/>), which is incorrect.</report>
       
diff --git a/src/pre-JATS-schematron.xsl b/src/pre-JATS-schematron.xsl
index e77421aea9..b4087b905c 100644
--- a/src/pre-JATS-schematron.xsl
+++ b/src/pre-JATS-schematron.xsl
@@ -7742,7 +7742,7 @@
       <xsl:variable name="name" select="e:get-name(name[1])"/>
       <xsl:variable name="role" select="role[1]"/>
       <xsl:variable name="author-contribs" select="ancestor::article-meta/contrib-group[1]/contrib[@contrib-type='author']"/>
-      <xsl:variable name="matching-author-names" select="for $contrib in $author-contribs where (e:get-name($contrib)=$name) return e:get-name($contrib)"/>
+      <xsl:variable name="matching-author-names" select="for $contrib in $author-contribs return if (e:get-name($contrib)=$name) then e:get-name($contrib) else ()"/>
 
 		    <!--REPORT error-->
       <xsl:if test="(@contrib-type='senior_editor') and ($role!='Senior Editor')">
diff --git a/src/schematron.sch b/src/schematron.sch
index 53dd543998..141966db53 100644
--- a/src/schematron.sch
+++ b/src/schematron.sch
@@ -1978,7 +1978,7 @@
       <let name="name" value="e:get-name(name[1])"/>
       <let name="role" value="role[1]"/>
       <let name="author-contribs" value="ancestor::article-meta/contrib-group[1]/contrib[@contrib-type='author']"/>
-      <let name="matching-author-names" value="for $contrib in $author-contribs where (e:get-name($contrib)=$name) return e:get-name($contrib)"/>
+      <let name="matching-author-names" value="for $contrib in $author-contribs return if (e:get-name($contrib)=$name) then e:get-name($contrib) else ()"/>
       
       <report test="(@contrib-type='senior_editor') and ($role!='Senior Editor')" 
         role="error" 
diff --git a/test/tests/gen/test-editors-contrib/editor-conformance-3/editor-conformance-3.sch b/test/tests/gen/test-editors-contrib/editor-conformance-3/editor-conformance-3.sch
index 03e985136f..7cba010069 100644
--- a/test/tests/gen/test-editors-contrib/editor-conformance-3/editor-conformance-3.sch
+++ b/test/tests/gen/test-editors-contrib/editor-conformance-3/editor-conformance-3.sch
@@ -1290,7 +1290,7 @@
       <let name="name" value="e:get-name(name[1])"/>
       <let name="role" value="role[1]"/>
       <let name="author-contribs" value="ancestor::article-meta/contrib-group[1]/contrib[@contrib-type='author']"/>
-      <let name="matching-author-names" value="for $contrib in $author-contribs where (e:get-name($contrib)=$name) return e:get-name($contrib)"/>
+      <let name="matching-author-names" value="for $contrib in $author-contribs return if (e:get-name($contrib)=$name) then e:get-name($contrib) else ()"/>
       <report test="(@contrib-type='senior_editor') and ($role!='Senior Editor')" role="error" id="editor-conformance-3">
         <value-of select="$name"/> has a @contrib-type='senior_editor' but their role is not 'Senior Editor' (<value-of select="$role"/>), which is incorrect.</report>
     </rule>
diff --git a/test/tests/gen/test-editors-contrib/editor-conformance-4/editor-conformance-4.sch b/test/tests/gen/test-editors-contrib/editor-conformance-4/editor-conformance-4.sch
index bc7f316745..e451274d47 100644
--- a/test/tests/gen/test-editors-contrib/editor-conformance-4/editor-conformance-4.sch
+++ b/test/tests/gen/test-editors-contrib/editor-conformance-4/editor-conformance-4.sch
@@ -1290,7 +1290,7 @@
       <let name="name" value="e:get-name(name[1])"/>
       <let name="role" value="role[1]"/>
       <let name="author-contribs" value="ancestor::article-meta/contrib-group[1]/contrib[@contrib-type='author']"/>
-      <let name="matching-author-names" value="for $contrib in $author-contribs where (e:get-name($contrib)=$name) return e:get-name($contrib)"/>
+      <let name="matching-author-names" value="for $contrib in $author-contribs return if (e:get-name($contrib)=$name) then e:get-name($contrib) else ()"/>
       <report test="(@contrib-type='editor') and ($role!='Reviewing Editor')" role="error" id="editor-conformance-4">
         <value-of select="$name"/> has a @contrib-type='editor' but their role is not 'Reviewing Editor' (<value-of select="$role"/>), which is incorrect.</report>
     </rule>
diff --git a/test/tests/gen/test-editors-contrib/editor-conformance-5/editor-conformance-5.sch b/test/tests/gen/test-editors-contrib/editor-conformance-5/editor-conformance-5.sch
index ed7904f3d0..26b86e96c7 100644
--- a/test/tests/gen/test-editors-contrib/editor-conformance-5/editor-conformance-5.sch
+++ b/test/tests/gen/test-editors-contrib/editor-conformance-5/editor-conformance-5.sch
@@ -1290,7 +1290,7 @@
       <let name="name" value="e:get-name(name[1])"/>
       <let name="role" value="role[1]"/>
       <let name="author-contribs" value="ancestor::article-meta/contrib-group[1]/contrib[@contrib-type='author']"/>
-      <let name="matching-author-names" value="for $contrib in $author-contribs where (e:get-name($contrib)=$name) return e:get-name($contrib)"/>
+      <let name="matching-author-names" value="for $contrib in $author-contribs return if (e:get-name($contrib)=$name) then e:get-name($contrib) else ()"/>
       <assert test="count($matching-author-names)=0" role="error" id="editor-conformance-5">
         <value-of select="$name"/> is listed both as an author as as a <value-of select="$role"/>, which must be incorrect.</assert>
     </rule>
diff --git a/test/xspec/schematron.sch b/test/xspec/schematron.sch
index 2c255c1853..f2932e4c35 100644
--- a/test/xspec/schematron.sch
+++ b/test/xspec/schematron.sch
@@ -1731,7 +1731,7 @@
       <let name="name" value="e:get-name(name[1])"/>
       <let name="role" value="role[1]"/>
       <let name="author-contribs" value="ancestor::article-meta/contrib-group[1]/contrib[@contrib-type='author']"/>
-      <let name="matching-author-names" value="for $contrib in $author-contribs where (e:get-name($contrib)=$name) return e:get-name($contrib)"/>
+      <let name="matching-author-names" value="for $contrib in $author-contribs return if (e:get-name($contrib)=$name) then e:get-name($contrib) else ()"/>
       
       <report test="(@contrib-type='senior_editor') and ($role!='Senior Editor')" role="error" id="editor-conformance-3">
         <value-of select="$name"/> has a @contrib-type='senior_editor' but their role is not 'Senior Editor' (<value-of select="$role"/>), which is incorrect.</report>