diff --git a/cmd/kube-scheduler/app/server.go b/cmd/kube-scheduler/app/server.go
index 6b84fc175b9..b65f4e74d09 100644
--- a/cmd/kube-scheduler/app/server.go
+++ b/cmd/kube-scheduler/app/server.go
@@ -205,7 +205,8 @@ func Run(ctx context.Context, cc *schedulerserverconfig.CompletedConfig, sched *
 					os.Exit(0)
 				default:
 					// We lost the lock.
-					klog.Exitf("leaderelection lost")
+					klog.ErrorS(nil, "Leaderelection lost")
+					os.Exit(1)
 				}
 			},
 		}
diff --git a/pkg/scheduler/framework/plugins/nodevolumelimits/csi.go b/pkg/scheduler/framework/plugins/nodevolumelimits/csi.go
index 19ba3168a26..55e53ed6eb6 100644
--- a/pkg/scheduler/framework/plugins/nodevolumelimits/csi.go
+++ b/pkg/scheduler/framework/plugins/nodevolumelimits/csi.go
@@ -193,7 +193,7 @@ func (pl *CSILimits) filterAttachableVolumes(
 
 		driverName, volumeHandle := pl.getCSIDriverInfo(csiNode, pvc)
 		if driverName == "" || volumeHandle == "" {
-			klog.V(5).Info("Could not find a CSI driver name or volume handle, not counting volume")
+			klog.V(5).InfoS("Could not find a CSI driver name or volume handle, not counting volume")
 			continue
 		}