diff --git a/cmd/nvmfplugin/nvmfplugin.go b/cmd/nvmfplugin/nvmfplugin.go
index ea36dce..133e0ea 100644
--- a/cmd/nvmfplugin/nvmfplugin.go
+++ b/cmd/nvmfplugin/nvmfplugin.go
@@ -23,8 +23,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/golang/glog"
 	"github.com/kubernetes-csi/csi-driver-nvmf/pkg/nvmf"
+	"k8s.io/klog"
 )
 
 var (
@@ -32,9 +32,10 @@ var (
 )
 
 func init() {
+	klog.InitFlags(nil)
 	flag.StringVar(&conf.Endpoint, "endpoint", "unix://csi/csi.sock", "CSI endpoint")
 	flag.StringVar(&conf.NodeID, "nodeid", "CSINode", "node id")
-	flag.BoolVar(&conf.IsControllerServer, "IsControllerServer", false, "Only run as controller service")
+	flag.BoolVar(&conf.IsControllerServer, "IsControllerServer", false, "also run as controller service")
 	flag.StringVar(&conf.DriverName, "drivername", nvmf.DefaultDriverName, "CSI Driver")
 	flag.StringVar(&conf.Region, "region", "test_region", "Region")
 	flag.StringVar(&conf.Version, "version", nvmf.DefaultDriverVersion, "Version")
@@ -62,12 +63,12 @@ func runDriver() {
 		servicePort = nvmf.DefaultDriverServicePort
 	}
 
-	glog.Info("CSI is running")
+	klog.Info("CSI is running")
 	server := &http.Server{Addr: ":" + servicePort}
 	http.HandleFunc("/healthz", healthHandler)
 
 	if err := server.ListenAndServe(); err != nil {
-		glog.Fatalf("Service health port listen and serve err : %s", err.Error())
+		klog.Fatalf("Service health port listen and serve err : %s", err.Error())
 	}
 	wg.Wait()
 	os.Exit(0)
diff --git a/deploy/kubernetes/csi-nvmf-node.yaml b/deploy/kubernetes/csi-nvmf-node.yaml
index 89c5bf0..d19ca19 100644
--- a/deploy/kubernetes/csi-nvmf-node.yaml
+++ b/deploy/kubernetes/csi-nvmf-node.yaml
@@ -21,7 +21,7 @@ spec:
           lifecycle:
             preStop:
               exec:
-                command: ["bin/sh", "-c", "rm -rf /registration/csi.nvmf.com \
+                command: ["/bin/sh", "-c", "rm -rf /registration/csi.nvmf.com \
                           /registration/csi.nvmf.com-reg.sock"]
           env:
             - name: KUBE_NODE_NAME
diff --git a/go.mod b/go.mod
index 5780f16..dbd854d 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,6 @@ go 1.14
 
 require (
 	github.com/container-storage-interface/spec v1.5.0
-	github.com/golang/glog v1.0.0
 	github.com/google/go-cmp v0.5.6 // indirect
 	github.com/kubernetes-csi/csi-lib-utils v0.11.0
 	github.com/sirupsen/logrus v1.8.1
diff --git a/go.sum b/go.sum
index 37a2775..60ccfb0 100644
--- a/go.sum
+++ b/go.sum
@@ -122,8 +122,6 @@ github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7a
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ=
-github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
diff --git a/pkg/nvmf/nvmf.go b/pkg/nvmf/nvmf.go
index af73431..18950de 100644
--- a/pkg/nvmf/nvmf.go
+++ b/pkg/nvmf/nvmf.go
@@ -61,7 +61,7 @@ func getNVMfDiskInfo(req *csi.NodePublishVolumeRequest) (*nvmfDiskInfo, error) {
 	deviceUUID := volOpts["deviceUUID"]
 	nqn := volOpts["nqn"]
 
-	if targetTrAddr == "" || nqn == "" || targetTrPort == "" || targetTrType == "" {
+	if targetTrAddr == "" || nqn == "" || targetTrPort == "" || targetTrType == "" || deviceUUID == "" {
 		return nil, fmt.Errorf("Some Nvme target info is missing, volID: %s ", volName)
 	}