diff --git a/src/mono/wasm/debugger/BrowserDebugProxy/DevToolsProxy.cs b/src/mono/wasm/debugger/BrowserDebugProxy/DevToolsProxy.cs
index 8474a2dc21cdc1..0f27d35a0710b5 100644
--- a/src/mono/wasm/debugger/BrowserDebugProxy/DevToolsProxy.cs
+++ b/src/mono/wasm/debugger/BrowserDebugProxy/DevToolsProxy.cs
@@ -61,6 +61,7 @@ private async Task<string> ReadOne(WebSocket socket, CancellationToken token)
                 WebSocketReceiveResult result = await socket.ReceiveAsync(new ArraySegment<byte>(buff), token);
                 if (result.MessageType == WebSocketMessageType.Close)
                 {
+                    Log("error", $"DevToolsProxy: Client initiated close: {result.CloseStatus.Value} - {result.CloseStatusDescription}");
                     client_initiated_close.TrySetResult();
                     return null;
                 }
@@ -257,7 +258,7 @@ public async Task Run(Uri browserUri, WebSocket ideSocket)
                     {
                         while (!x.IsCancellationRequested)
                         {
-                            Task task = await Task.WhenAny(pending_ops.ToArray());
+                            Task task = await Task.WhenAny(pending_ops.Where(i => i != null).ToArray());
 
                             if (client_initiated_close.Task.IsCompleted)
                             {