diff --git a/lib/private/systemtag/systemtagmanager.php b/lib/private/systemtag/systemtagmanager.php
index 95b9a61ca3..3cc45fc952 100644
--- a/lib/private/systemtag/systemtagmanager.php
+++ b/lib/private/systemtag/systemtagmanager.php
@@ -94,9 +94,7 @@ class SystemTagManager implements ISystemTagManager {
 		$result->closeCursor();
 
 		if (count($tags) !== count($tagIds)) {
-			throw new TagNotFoundException(
-				'Tag(s) with id(s) ' . json_encode(array_diff($tagIds, array_keys($tags))) . ' not found'
-			);
+			throw new TagNotFoundException(json_encode(array_diff($tagIds, array_keys($tags))));
 		}
 
 		return $tags;
diff --git a/lib/public/systemtag/isystemtagmanager.php b/lib/public/systemtag/isystemtagmanager.php
index 2020ec5290..ffdaf03879 100644
--- a/lib/public/systemtag/isystemtagmanager.php
+++ b/lib/public/systemtag/isystemtagmanager.php
@@ -35,7 +35,9 @@ interface ISystemTagManager {
 	 *
 	 * @return \OCP\SystemTag\ISystemTag[] array of system tags with tag id as key
 	 *
-	 * @throws \OCP\SystemTag\TagNotFoundException if at least one given tag id did no exist
+	 * @throws \InvalidArgumentException if at least one given tag ids is invalid (string instead of integer, etc.)
+	 * @throws \OCP\SystemTag\TagNotFoundException if at least one given tag ids did no exist
+	 * 			The message contains a json_encoded array of the ids that could not be found
 	 *
 	 * @since 9.0.0
 	 */