diff --git a/Aaru.Images/ZZZRawImage/Properties.cs b/Aaru.Images/ZZZRawImage/Properties.cs
index 0a55a72d4..8a75a962d 100644
--- a/Aaru.Images/ZZZRawImage/Properties.cs
+++ b/Aaru.Images/ZZZRawImage/Properties.cs
@@ -67,7 +67,7 @@ namespace Aaru.DiscImages
                                                                 ? 2336
                                                                 : 2048 : (int)_imageInfo.SectorSize,
                     TrackEndSector         = _imageInfo.Sectors - 1,
-                    TrackFile              = _rawImageFilter.GetFilename(),
+                    TrackFile              = _rawImageFilter?.GetFilename() ?? _basePath,
                     TrackFileOffset        = 0,
                     TrackFileType          = "BINARY",
                     TrackRawBytesPerSector = _rawCompactDisc ? 2352 : (int)_imageInfo.SectorSize,