diff --git a/renderdoc/core/remote_server.cpp b/renderdoc/core/remote_server.cpp
index 66b1d6b26..bdc882e39 100644
--- a/renderdoc/core/remote_server.cpp
+++ b/renderdoc/core/remote_server.cpp
@@ -1247,7 +1247,10 @@ RENDERDOC_CreateRemoteServerConnection(const rdcstr &URL, IRemoteServer **rend)
   }
 
   if(rend == NULL)
+  {
+    SAFE_DELETE(sock);
     return RDResult(ResultCode::Succeeded);
+  }
 
   if(protocol)
     *rend = protocol->CreateRemoteServer(sock, deviceID);
diff --git a/renderdoc/os/win32/win32_process.cpp b/renderdoc/os/win32/win32_process.cpp
index e299fdefa..7795905dc 100644
--- a/renderdoc/os/win32/win32_process.cpp
+++ b/renderdoc/os/win32/win32_process.cpp
@@ -1060,6 +1060,12 @@ uint32_t Process::LaunchProcess(const rdcstr &app, const rdcstr &workingDir, con
   {
     if(!internal)
       RDCWARN("Couldn't launch process '%s'", appPath.c_str());
+
+    if(hChildStdError_Rd != NULL)
+      CloseHandle(hChildStdError_Rd);
+    if(hChildStdOutput_Rd != NULL)
+      CloseHandle(hChildStdOutput_Rd);
+
     return 0;
   }