diff --git a/OF DL.Core/Services/FileNameService.cs b/OF DL.Core/Services/FileNameService.cs
index 92414e8..45108b5 100644
--- a/OF DL.Core/Services/FileNameService.cs	
+++ b/OF DL.Core/Services/FileNameService.cs	
@@ -200,9 +200,11 @@ public class FileNameService(IAuthService authService) : IFileNameService
         object? value = source;
         foreach (string propertyName in propertyPath.Split('.'))
         {
-            PropertyInfo property = value?.GetType().GetProperty(propertyName) ??
-                                    throw new ArgumentException($"Property '{propertyName}' not found.");
-            value = property.GetValue(value);
+            PropertyInfo? property = value?.GetType().GetProperty(propertyName);
+            value = property?.GetValue(value);
+
+            if (value is null)
+                break;
         }
 
         return value;