diff --git a/pkg/cri/server/service_linux.go b/pkg/cri/server/service_linux.go
index 4b3c0bbe0..612bff87d 100644
--- a/pkg/cri/server/service_linux.go
+++ b/pkg/cri/server/service_linux.go
@@ -92,7 +92,7 @@ func (c *criService) initPlatform() (err error) {
 		reg := cdi.GetRegistry()
 		err = reg.Configure(cdi.WithSpecDirs(c.config.CDISpecDirs...))
 		if err != nil {
-			return fmt.Errorf("failed to configure CDI registry")
+			return fmt.Errorf("failed to configure CDI registry: %w", err)
 		}
 	}
 
diff --git a/pkg/cri/server/service_other.go b/pkg/cri/server/service_other.go
index 3b57c12c0..40e864a02 100644
--- a/pkg/cri/server/service_other.go
+++ b/pkg/cri/server/service_other.go
@@ -22,12 +22,13 @@ import (
 	cni "github.com/containerd/go-cni"
 )
 
-// initPlatform handles linux specific initialization for the CRI service.
+// initPlatform handles initialization for the CRI service on non-Windows and non-Linux
+// platforms.
 func (c *criService) initPlatform() error {
 	return nil
 }
 
-// cniLoadOptions returns cni load options for the linux.
+// cniLoadOptions returns cni load options for non-Windows and non-Linux platforms.
 func (c *criService) cniLoadOptions() []cni.Opt {
 	return []cni.Opt{}
 }
diff --git a/pkg/cri/server/service_windows.go b/pkg/cri/server/service_windows.go
index 2d660c16f..e71373164 100644
--- a/pkg/cri/server/service_windows.go
+++ b/pkg/cri/server/service_windows.go
@@ -26,7 +26,7 @@ import (
 // attaches to
 const windowsNetworkAttachCount = 1
 
-// initPlatform handles linux specific initialization for the CRI service.
+// initPlatform handles Windows specific initialization for the CRI service.
 func (c *criService) initPlatform() error {
 	pluginDirs := map[string]string{
 		defaultNetworkPlugin: c.config.NetworkPluginConfDir,