From 7104f42f56cfed1014f5d5b8efbfb06b7f13bad2 Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Sat, 22 Jun 2019 18:45:37 -0700
Subject: [PATCH] Trycatch savefile load, handle bad backups

---
 PKHeX.WinForms/Subforms/SAV_Database.cs | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/PKHeX.WinForms/Subforms/SAV_Database.cs b/PKHeX.WinForms/Subforms/SAV_Database.cs
index 69f009af0..a3a8f3f6c 100644
--- a/PKHeX.WinForms/Subforms/SAV_Database.cs
+++ b/PKHeX.WinForms/Subforms/SAV_Database.cs
@@ -360,8 +360,14 @@ private static List<PKM> LoadPKMSaves(string pkmdb, string savdb, string EXTERNA
             {
                 Parallel.ForEach(result, file =>
                 {
+                    try {
                     var sav = SaveUtil.GetVariantSAV(file);
-                    var path = EXTERNAL_SAV + new FileInfo(file).Name;
+                    if (sav == null)
+                    {
+                        Console.WriteLine("Unable to load SaveFile: " + file);
+                        return; // bad backup
+                    }
+                    var path = EXTERNAL_SAV + Path.GetFileName(file);
                     if (sav.HasBox)
                     {
                         foreach (var pk in sav.BoxData)
@@ -373,6 +379,12 @@ void addPKM(PKM pk)
                         pk.Identifier = Path.Combine(path, pk.Identifier);
                         dbTemp.Add(pk);
                     }
+                    }
+                    catch (Exception ex)
+                    {
+                        Console.WriteLine("ERROR: Unable to load SaveFile: " + file);
+                        Console.WriteLine(ex.Message);
+                    }
                 });
             }
 #endif