diff --git a/daemon/daemon.go b/daemon/daemon.go
index 04ef61b039..64f961b12b 100644
--- a/daemon/daemon.go
+++ b/daemon/daemon.go
@@ -670,7 +670,7 @@ func NewDaemon(config *Config, registryService registry.Service, containerdRemot
 		return nil, err
 	}
 
-	// Plugin system initialization should happen before restore. Dont change order.
+	// Plugin system initialization should happen before restore. Do not change order.
 	if err := pluginInit(d, config, containerdRemote); err != nil {
 		return nil, err
 	}
diff --git a/libcontainerd/client_windows.go b/libcontainerd/client_windows.go
index 86dd9c60de..1e833ce862 100644
--- a/libcontainerd/client_windows.go
+++ b/libcontainerd/client_windows.go
@@ -328,6 +328,7 @@ func (clnt *client) AddProcess(ctx context.Context, containerID, processFriendly
 
 	// Tell the engine to attach streams back to the client
 	if err := clnt.backend.AttachStreams(processFriendlyName, *iopipe); err != nil {
+		clnt.lock(containerID)
 		return err
 	}