diff --git a/pkg/mcs/registry/registry.go b/pkg/mcs/registry/registry.go
index 9e88b409f13..c6470b34dc4 100644
--- a/pkg/mcs/registry/registry.go
+++ b/pkg/mcs/registry/registry.go
@@ -83,7 +83,7 @@ func (r *ServiceRegistry) InstallAllRESTHandler(srv bs.Server, h map[string]http
 		serviceName := createServiceName(prefix, name)
 		if l, ok := r.services[serviceName]; ok {
 			if err := l.RegisterRESTHandler(h); err != nil {
-				log.Error("register REST handler failed", zap.String("prefix", prefix), zap.String("service-name", name), zap.Error(err))
+				log.Error("register restful API service failed", zap.String("prefix", prefix), zap.String("service-name", name), zap.Error(err))
 			} else {
 				log.Info("restful API service already registered", zap.String("prefix", prefix), zap.String("service-name", name))
 			}
@@ -92,7 +92,7 @@ func (r *ServiceRegistry) InstallAllRESTHandler(srv bs.Server, h map[string]http
 		l := builder(srv)
 		r.services[serviceName] = l
 		if err := l.RegisterRESTHandler(h); err != nil {
-			log.Error("register REST handler failed", zap.String("prefix", prefix), zap.String("service-name", name), zap.Error(err))
+			log.Error("register restful API service failed", zap.String("prefix", prefix), zap.String("service-name", name), zap.Error(err))
 		} else {
 			log.Info("restful API service registered successfully", zap.String("prefix", prefix), zap.String("service-name", name))
 		}
diff --git a/pkg/storage/endpoint/gc_safe_point.go b/pkg/storage/endpoint/gc_safe_point.go
index 6c4beb1bb77..85b29e0b47e 100644
--- a/pkg/storage/endpoint/gc_safe_point.go
+++ b/pkg/storage/endpoint/gc_safe_point.go
@@ -101,7 +101,7 @@ func (se *StorageEndpoint) LoadMinServiceGCSafePoint(now time.Time) (*ServiceSaf
 
 		if ssp.ExpiredAt < now.Unix() {
 			if err := se.Remove(key); err != nil {
-				return nil, err
+				log.Error("failed to remove expired service safepoint", errs.ZapError(err))
 			}
 			continue
 		}