From c5c30189e43f93c3f3c66207945187a974656c9e Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 20 May 2020 02:14:30 -0400
Subject: fix error-handling when patch is called with a null target method
 (#711)

---
 .../Framework/ModLoading/RewriteFacades/HarmonyInstanceMethods.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/SMAPI/Framework/ModLoading/RewriteFacades')

diff --git a/src/SMAPI/Framework/ModLoading/RewriteFacades/HarmonyInstanceMethods.cs b/src/SMAPI/Framework/ModLoading/RewriteFacades/HarmonyInstanceMethods.cs
index 78cf25f8..17b6bcd9 100644
--- a/src/SMAPI/Framework/ModLoading/RewriteFacades/HarmonyInstanceMethods.cs
+++ b/src/SMAPI/Framework/ModLoading/RewriteFacades/HarmonyInstanceMethods.cs
@@ -34,6 +34,7 @@ namespace StardewModdingAPI.Framework.ModLoading.RewriteFacades
             }
             catch (Exception ex)
             {
+                // get patch types
                 var patchTypes = new List<string>();
                 if (prefix != null)
                     patchTypes.Add("prefix");
@@ -42,7 +43,12 @@ namespace StardewModdingAPI.Framework.ModLoading.RewriteFacades
                 if (transpiler != null)
                     patchTypes.Add("transpiler");
 
-                throw new Exception($"Harmony instance {this.Id} failed applying {string.Join("/", patchTypes)} to method {original.DeclaringType?.FullName}.{original.Name}.", ex);
+                // get original method label
+                string methodLabel = original != null
+                    ? $"method {original.DeclaringType?.FullName}.{original.Name}"
+                    : "null method";
+
+                throw new Exception($"Harmony instance {this.Id} failed applying {string.Join("/", patchTypes)} to {methodLabel}.", ex);
             }
         }
     }
-- 
cgit