diff --git a/phpstan-baseline-7.4.neon b/phpstan-baseline-7.4.neon
index 1b464cbfcd..04ac64b05c 100644
--- a/phpstan-baseline-7.4.neon
+++ b/phpstan-baseline-7.4.neon
@@ -528,6 +528,18 @@ parameters:
 			count: 3
 			path: tests/integration/Core/Repository/RoleServiceTest.php
 
+		-
+			message: '#^Parameter \#1 \$class of class ReflectionProperty constructor expects object\|string, class\-string\|false given\.$#'
+			identifier: argument.type
+			count: 4
+			path: tests/integration/Core/Repository/SearchServiceLocationTest.php
+
+		-
+			message: '#^Parameter \#1 \$class of class ReflectionProperty constructor expects object\|string, class\-string\|false given\.$#'
+			identifier: argument.type
+			count: 4
+			path: tests/integration/Core/Repository/SearchServiceTest.php
+
 		-
 			message: '#^Parameter \#1 \$str of function md5 expects string, int\<1, max\> given\.$#'
 			identifier: argument.type
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 17194ab4cf..2731a48f08 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -342,12 +342,6 @@ parameters:
 			count: 1
 			path: src/bundle/Core/Command/ReindexCommand.php
 
-		-
-			message: '#^Parameter \#2 \$subject of function preg_match expects string, string\|false given\.$#'
-			identifier: argument.type
-			count: 1
-			path: src/bundle/Core/Command/ReindexCommand.php
-
 		-
 			message: '#^Parameter \#2 \$subject of function preg_match_all expects string, string\|false given\.$#'
 			identifier: argument.type
diff --git a/src/lib/FieldType/MapLocation/MapLocationStorage/Gateway/DoctrineStorage.php b/src/lib/FieldType/MapLocation/MapLocationStorage/Gateway/DoctrineStorage.php
index ddc8e0213b..db1c5d41f2 100644
--- a/src/lib/FieldType/MapLocation/MapLocationStorage/Gateway/DoctrineStorage.php
+++ b/src/lib/FieldType/MapLocation/MapLocationStorage/Gateway/DoctrineStorage.php
@@ -146,7 +146,7 @@ public function getFieldData(VersionInfo $versionInfo, Field $field)
      * @param int $fieldId
      * @param int $versionNo
      *
-     * @return array|null
+     * @return array|\ArrayAccess<string, float>|null
      */
     protected function loadFieldData($fieldId, $versionNo)
     {
diff --git a/src/lib/Repository/Helper/RelationProcessor.php b/src/lib/Repository/Helper/RelationProcessor.php
index c837de500d..df5cd0210e 100644
--- a/src/lib/Repository/Helper/RelationProcessor.php
+++ b/src/lib/Repository/Helper/RelationProcessor.php
@@ -145,7 +145,11 @@ public function processFieldRelations(
             if ($relationType === Relation::FIELD || $relationType === Relation::ASSET) {
                 foreach ($relationData as $fieldDefinitionId => $contentIds) {
                     foreach (array_keys($contentIds) as $destinationContentId) {
-                        if (isset($mappedRelations[$relationType][$fieldDefinitionId][$destinationContentId])) {
+                        if (
+                            isset($mappedRelations[$relationType][$fieldDefinitionId]) &&
+                            is_array($mappedRelations[$relationType][$fieldDefinitionId]) &&
+                            isset($mappedRelations[$relationType][$fieldDefinitionId][$destinationContentId])
+                        ) {
                             unset($mappedRelations[$relationType][$fieldDefinitionId][$destinationContentId]);
                         } else {
                             $this->persistenceHandler->contentHandler()->addRelation(
diff --git a/tests/lib/Validation/ValidationFailedExceptionTest.php b/tests/lib/Validation/ValidationFailedExceptionTest.php
index fbdfe3f02f..350484f5aa 100644
--- a/tests/lib/Validation/ValidationFailedExceptionTest.php
+++ b/tests/lib/Validation/ValidationFailedExceptionTest.php
@@ -55,6 +55,7 @@ public function testEmptyErrorList(): void
             'Cannot create %s with empty validation error list.',
             ValidationFailedException::class,
         ));
-        new ValidationFailedException('__argument_name__', $errors);
+        $exception = new ValidationFailedException('__argument_name__', $errors);
+        self::assertSame($errors, $exception->getErrors());
     }
 }