diff --git a/AquaMai/AquaMai.csproj b/AquaMai/AquaMai.csproj
index 14c311de..37f4111e 100644
--- a/AquaMai/AquaMai.csproj
+++ b/AquaMai/AquaMai.csproj
@@ -293,6 +293,7 @@
     <Compile Include="Fix\DisableReboot.cs" />
     <Compile Include="Fix\ExtendNotesPool.cs" />
     <Compile Include="Fix\FixCharaCrash.cs" />
+    <Compile Include="Fix\FixCheckAuth.cs" />
     <Compile Include="Fix\ForceAsServer.cs" />
     <Compile Include="Fix\ForceFreePlay.cs" />
     <Compile Include="Fix\ForcePaidPlay.cs" />
diff --git a/AquaMai/Fix/BasicFix.cs b/AquaMai/Fix/BasicFix.cs
index b89c6009..3a6e10b8 100644
--- a/AquaMai/Fix/BasicFix.cs
+++ b/AquaMai/Fix/BasicFix.cs
@@ -1,7 +1,5 @@
-using AMDaemon.Allnet;
-using HarmonyLib;
+using HarmonyLib;
 using Manager;
-using Manager.Operation;
 using Monitor.MusicSelect.ChainList;
 using Net;
 using UnityEngine;
@@ -17,16 +15,6 @@ public class BasicFix
         return false;
     }
 
-    [HarmonyPostfix]
-    [HarmonyPatch(typeof(OperationManager), "CheckAuth_Proc")]
-    private static void PostCheckAuthProc(ref OperationData ____operationData)
-    {
-        if (Auth.GameServerUri.StartsWith("http://") || Auth.GameServerUri.StartsWith("https://"))
-        {
-            ____operationData.ServerUri = Auth.GameServerUri;
-        }
-    }
-
     [HarmonyPrefix]
     [HarmonyPatch(typeof(DebugInput), "GetKey")]
     private static bool GetKey(ref bool __result, KeyCode name)
diff --git a/AquaMai/Fix/FixCheckAuth.cs b/AquaMai/Fix/FixCheckAuth.cs
new file mode 100644
index 00000000..1b350991
--- /dev/null
+++ b/AquaMai/Fix/FixCheckAuth.cs
@@ -0,0 +1,19 @@
+using AMDaemon.Allnet;
+using HarmonyLib;
+using Manager;
+using Manager.Operation;
+
+namespace AquaMai.Fix;
+
+public class FixCheckAuth
+{
+    [HarmonyPostfix]
+    [HarmonyPatch(typeof(OperationManager), "CheckAuth_Proc")]
+    private static void PostCheckAuthProc(ref OperationData ____operationData)
+    {
+        if (Auth.GameServerUri.StartsWith("http://") || Auth.GameServerUri.StartsWith("https://"))
+        {
+            ____operationData.ServerUri = Auth.GameServerUri;
+        }
+    }
+}
diff --git a/AquaMai/Main.cs b/AquaMai/Main.cs
index a9f24445..7bdcbc2f 100644
--- a/AquaMai/Main.cs
+++ b/AquaMai/Main.cs
@@ -24,10 +24,17 @@ namespace AquaMai
         private void Patch(Type type)
         {
             MelonLogger.Msg($"> Patching {type}");
-            HarmonyInstance.PatchAll(type);
-            foreach (var nested in type.GetNestedTypes())
+            try
             {
-                Patch(nested);
+                HarmonyInstance.PatchAll(type);
+                foreach (var nested in type.GetNestedTypes())
+                {
+                    Patch(nested);
+                }
+            }
+            catch (Exception e)
+            {
+                MelonLogger.Error($"Failed to patch {type}: {e}");
             }
         }
 
@@ -96,6 +103,7 @@ namespace AquaMai
             Patch(typeof(BasicFix));
             Patch(typeof(DisableReboot));
             Patch(typeof(ExtendNotesPool));
+            Patch(typeof(FixCheckAuth));
             // UX
             Patch(typeof(CustomVersionString));
             Patch(typeof(CustomPlaceName));