diff --git a/pkg/kubelet/cm/devicemanager/plugin/v1beta1/server.go b/pkg/kubelet/cm/devicemanager/plugin/v1beta1/server.go
index d6ddd26b8d1..6aa6936bab9 100644
--- a/pkg/kubelet/cm/devicemanager/plugin/v1beta1/server.go
+++ b/pkg/kubelet/cm/devicemanager/plugin/v1beta1/server.go
@@ -109,7 +109,9 @@ func (s *server) Start() error {
 	api.RegisterRegistrationServer(s.grpc, s)
 	go func() {
 		defer s.wg.Done()
-		s.grpc.Serve(ln)
+		if err = s.grpc.Serve(ln); err != nil {
+			klog.ErrorS(err, "Error while serving device plugin registration grpc server")
+		}
 	}()
 
 	return nil
diff --git a/pkg/kubelet/cm/devicemanager/plugin/v1beta1/stub.go b/pkg/kubelet/cm/devicemanager/plugin/v1beta1/stub.go
index fbec3456e46..9550d35e2d6 100644
--- a/pkg/kubelet/cm/devicemanager/plugin/v1beta1/stub.go
+++ b/pkg/kubelet/cm/devicemanager/plugin/v1beta1/stub.go
@@ -156,7 +156,9 @@ func (m *Stub) Start() error {
 
 	go func() {
 		defer m.wg.Done()
-		m.server.Serve(sock)
+		if err = m.server.Serve(sock); err != nil {
+			klog.ErrorS(err, "Error while serving device plugin registration grpc server")
+		}
 	}()
 
 	var lastDialErr error