diff --git a/pkg/cri/sbserver/container_checkpoint.go b/pkg/cri/sbserver/container_checkpoint.go
index de78f8f7d..1c017bd9a 100644
--- a/pkg/cri/sbserver/container_checkpoint.go
+++ b/pkg/cri/sbserver/container_checkpoint.go
@@ -18,11 +18,12 @@ package sbserver
 
 import (
 	"context"
-	"errors"
 
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
 func (c *criService) CheckpointContainer(ctx context.Context, r *runtime.CheckpointContainerRequest) (res *runtime.CheckpointContainerResponse, err error) {
-	return nil, errors.New("not implemented")
+	return nil, status.Errorf(codes.Unimplemented, "method CheckpointContainer not implemented")
 }
diff --git a/pkg/cri/sbserver/container_events.go b/pkg/cri/sbserver/container_events.go
index f90d6bf6b..4d718372d 100644
--- a/pkg/cri/sbserver/container_events.go
+++ b/pkg/cri/sbserver/container_events.go
@@ -17,11 +17,11 @@
 package sbserver
 
 import (
-	"errors"
-
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
 func (c *criService) GetContainerEvents(r *runtime.GetEventsRequest, s runtime.RuntimeService_GetContainerEventsServer) error {
-	return errors.New("not implemented")
+	return status.Errorf(codes.Unimplemented, "method GetContainerEvents not implemented")
 }
diff --git a/pkg/cri/server/container_checkpoint.go b/pkg/cri/server/container_checkpoint.go
index 5e7b818ed..8a6e79941 100644
--- a/pkg/cri/server/container_checkpoint.go
+++ b/pkg/cri/server/container_checkpoint.go
@@ -18,11 +18,12 @@ package server
 
 import (
 	"context"
-	"errors"
 
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
 func (c *criService) CheckpointContainer(ctx context.Context, r *runtime.CheckpointContainerRequest) (res *runtime.CheckpointContainerResponse, err error) {
-	return nil, errors.New("not implemented")
+	return nil, status.Errorf(codes.Unimplemented, "method CheckpointContainer not implemented")
 }
diff --git a/pkg/cri/server/container_events.go b/pkg/cri/server/container_events.go
index 136705b7c..560798fb5 100644
--- a/pkg/cri/server/container_events.go
+++ b/pkg/cri/server/container_events.go
@@ -17,11 +17,11 @@
 package server
 
 import (
-	"errors"
-
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
 func (c *criService) GetContainerEvents(r *runtime.GetEventsRequest, s runtime.RuntimeService_GetContainerEventsServer) error {
-	return errors.New("not implemented")
+	return status.Errorf(codes.Unimplemented, "method GetContainerEvents not implemented")
 }