Merge branch 'develop' into stable

1 files changed, 12 insertions, 4 deletions

diff --git a/src/SMAPI/Program.cs b/src/SMAPI/Program.cs
index 2eec371c..3a34872a 100644
--- a/src/SMAPI/Program.cs
+++ b/src/SMAPI/Program.cs
@@ -30,10 +30,18 @@ namespace StardewModdingAPI
         /// <param name="args">The command-line arguments.</param>
         public static void Main(string[] args)
         {
-            AppDomain.CurrentDomain.AssemblyResolve += Program.CurrentDomain_AssemblyResolve;
-            Program.AssertGamePresent();
-            Program.AssertGameVersion();
-            Program.Start(args);
+            try
+            {
+                AppDomain.CurrentDomain.AssemblyResolve += Program.CurrentDomain_AssemblyResolve;
+                Program.AssertGamePresent();
+                Program.AssertGameVersion();
+                Program.Start(args);
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"SMAPI failed to initialise: {ex}");
+                Program.PressAnyKeyToExit(true);
+            }
         }