diff --git a/NzbDrone.Core/MediaFiles/DiskScanService.cs b/NzbDrone.Core/MediaFiles/DiskScanService.cs
index d8d07e967..d876ac723 100644
--- a/NzbDrone.Core/MediaFiles/DiskScanService.cs
+++ b/NzbDrone.Core/MediaFiles/DiskScanService.cs
@@ -55,7 +55,14 @@ private void Scan(Series series)
 
             foreach (var filePath in mediaFileList)
             {
-                ImportFile(series, filePath);
+                try
+                {
+                    ImportFile(series, filePath);
+                }
+                catch (Exception e)
+                {
+                    Logger.ErrorException("Couldn't import file " + filePath, e);
+                }
             }
 
             //Todo: Find the "best" episode file for all found episodes and import that one
@@ -141,7 +148,14 @@ public void Execute(DiskScanCommand message)
 
             foreach (var series in seriesToScan)
             {
-                Scan(series);
+                try
+                {
+                    Scan(series);
+                }
+                catch (Exception e)
+                {
+                    Logger.ErrorException("Diskscan failed for " + series.Title, e);
+                }
             }
         }
 
diff --git a/NzbDrone.Core/Parser/ParsingService.cs b/NzbDrone.Core/Parser/ParsingService.cs
index 9eb562a6c..79995d75a 100644
--- a/NzbDrone.Core/Parser/ParsingService.cs
+++ b/NzbDrone.Core/Parser/ParsingService.cs
@@ -98,6 +98,9 @@ private List<Episode> GetEpisodes(ParsedEpisodeInfo parsedEpisodeInfo, Series se
                     return new List<Episode>();
                 }
 
+                
+                //TODO: this will fail since parsed date will be local, and stored date will be UTC
+                //which means they will probebly end up on diffrent dates
                 var episodeInfo = _episodeService.GetEpisode(series.Id, parsedEpisodeInfo.AirDate.Value);
 
                 if (episodeInfo != null)