diff --git a/src/NzbDrone.Core/MediaFiles/DownloadedTracksImportService.cs b/src/NzbDrone.Core/MediaFiles/DownloadedTracksImportService.cs
index 5312b655c..35008b8ac 100644
--- a/src/NzbDrone.Core/MediaFiles/DownloadedTracksImportService.cs
+++ b/src/NzbDrone.Core/MediaFiles/DownloadedTracksImportService.cs
@@ -175,6 +175,10 @@ namespace NzbDrone.Core.MediaFiles
                     ReleaseHash = folderInfo.ReleaseHash,
                 };
             }
+            else
+            {
+                trackInfo = null;
+            }
 
             var audioFiles = _diskScanService.FilterFiles(directoryInfo.FullName, _diskScanService.GetAudioFiles(directoryInfo.FullName));
 
diff --git a/src/NzbDrone.Core/Parser/Model/ParsedTrackInfo.cs b/src/NzbDrone.Core/Parser/Model/ParsedTrackInfo.cs
index cdf1593ce..60771920c 100644
--- a/src/NzbDrone.Core/Parser/Model/ParsedTrackInfo.cs
+++ b/src/NzbDrone.Core/Parser/Model/ParsedTrackInfo.cs
@@ -38,9 +38,8 @@ namespace NzbDrone.Core.Parser.Model
             {
                 trackString = string.Format("T{0}", string.Join("-", TrackNumbers.Select(c => c.ToString("00"))));
             }
-            
 
-            return string.Format("{0} - {1} {2}", ArtistTitle, trackString, Quality);
+            return string.Format("{0} - {1} - {2}: {3}", ArtistTitle, AlbumTitle, trackString, Quality);
         }
     }
 }