diff --git a/UnityMcpBridge/Editor/Windows/ManualConfigEditorWindow.cs b/UnityMcpBridge/Editor/Windows/ManualConfigEditorWindow.cs
index 8cdf0dc..4590d40 100644
--- a/UnityMcpBridge/Editor/Windows/ManualConfigEditorWindow.cs
+++ b/UnityMcpBridge/Editor/Windows/ManualConfigEditorWindow.cs
@@ -87,7 +87,7 @@ namespace UnityMcpBridge.Editor.Windows
                     instructionStyle
                 );
             }
-            else if (mcpClient.mcpType == McpTypes.Windsurf)
+            else if (mcpClient?.mcpType == McpTypes.Windsurf)
             {
                 EditorGUILayout.LabelField(
                     "    a) Going to File > Preferences > Windsurf Settings > MCP > Manage MCPs -> View raw config",