diff --git a/Neos.Neos/Classes/AssetUsage/Service/AssetUsageIndexingService.php b/Neos.Neos/Classes/AssetUsage/Service/AssetUsageIndexingService.php index a6c42ef5523..b3dde8dd17a 100644 --- a/Neos.Neos/Classes/AssetUsage/Service/AssetUsageIndexingService.php +++ b/Neos.Neos/Classes/AssetUsage/Service/AssetUsageIndexingService.php @@ -273,7 +273,7 @@ private function getAssetIdsByProperty(NodeType $nodeType, PropertyCollection $p $propertyType, $propertyValues->offsetGet($propertyName), ); - } catch (\Exception) { + } catch (\Throwable) { $extractedAssetIds = []; // We can't deserialize the property, so skip. } @@ -291,6 +291,9 @@ private function getAssetIdsByProperty(NodeType $nodeType, PropertyCollection $p */ private function extractAssetIds(string $type, mixed $value): array { + if ($value === null) { + return []; + } if (is_string($value)) { preg_match_all('/asset:\/\/(?[\w-]*)/i', $value, $matches, PREG_SET_ORDER); return array_map(static fn (array $match) => $match['assetId'], $matches);