Merge branch 'develop' into stable

1 files changed, 17 insertions, 10 deletions

diff --git a/src/SMAPI.Internal/ExceptionExtensions.cs b/src/SMAPI.Internal/ExceptionExtensions.cs
index 5f1ee1fa..d8189048 100644
--- a/src/SMAPI.Internal/ExceptionExtensions.cs
+++ b/src/SMAPI.Internal/ExceptionExtensions.cs
@@ -13,19 +13,26 @@ namespace StardewModdingAPI.Internal
         /// <param name="exception">The error to summarize.</param>
         public static string GetLogSummary(this Exception exception)
         {
-            switch (exception)
+            try
             {
-                case TypeLoadException ex:
-                    return $"Failed loading type '{ex.TypeName}': {exception}";
+                switch (exception)
+                {
+                    case TypeLoadException ex:
+                        return $"Failed loading type '{ex.TypeName}': {exception}";
 
-                case ReflectionTypeLoadException ex:
-                    string summary = ex.ToString();
-                    foreach (Exception childEx in ex.LoaderExceptions ?? new Exception[0])
-                        summary += $"\n\n{childEx?.GetLogSummary()}";
-                    return summary;
+                    case ReflectionTypeLoadException ex:
+                        string summary = ex.ToString();
+                        foreach (Exception childEx in ex.LoaderExceptions ?? new Exception[0])
+                            summary += $"\n\n{childEx?.GetLogSummary()}";
+                        return summary;
 
-                default:
-                    return exception.ToString();
+                    default:
+                        return exception?.ToString() ?? $"<null exception>\n{Environment.StackTrace}";
+                }
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"Failed handling {exception?.GetType().FullName} (original message: {exception?.Message})", ex);
             }
         }