diff --git a/pkg/driver/grpc.go b/pkg/driver/grpc.go
index ac3a85f..96e5067 100644
--- a/pkg/driver/grpc.go
+++ b/pkg/driver/grpc.go
@@ -190,6 +190,8 @@ func (s *nonBlockingGRPCServer) serve(endpoint string, ids csi.IdentityServer, c
 	klog.Infof("Listening for connections on address: %#v", listener.Addr())
 
 	// Start serving requests on the grpc server created
-	server.Serve(listener)
-
+	err = server.Serve(listener)
+	if err != nil {
+		klog.Fatal(err.Error())
+	}
 }
diff --git a/pkg/usage/versionset.go b/pkg/usage/versionset.go
index c296576..16a7705 100644
--- a/pkg/usage/versionset.go
+++ b/pkg/usage/versionset.go
@@ -57,7 +57,11 @@ func (v *VersionSet) fetchAndSetVersion() error {
 	if err != nil {
 		return err
 	}
-	env.Set(clusterUUID, v.id)
+
+	err = env.Set(clusterUUID, v.id)
+	if err != nil {
+		return err
+	}
 
 	k8s, err := k8sapi.GetServerVersion()
 	if err != nil {
@@ -66,16 +70,30 @@ func (v *VersionSet) fetchAndSetVersion() error {
 	// eg. linux/amd64
 	v.k8sArch = k8s.Platform
 	v.k8sVersion = k8s.GitVersion
-	env.Set(clusterArch, v.k8sArch)
-	env.Set(clusterVersion, v.k8sVersion)
+
+	err = env.Set(clusterArch, v.k8sArch)
+	if err != nil {
+		return err
+	}
+
+	err = env.Set(clusterVersion, v.k8sVersion)
+	if err != nil {
+		return err
+	}
+
 	v.nodeType, err = k8sapi.GetOSAndKernelVersion()
+	if err != nil {
+		return err
+	}
+
 	env.Set(nodeType, v.nodeType)
 	if err != nil {
 		return err
 	}
 	v.openebsVersion = openebsversion.GetVersionDetails()
-	env.Set(openEBSversion, v.openebsVersion)
-	return nil
+
+	err = env.Set(openEBSversion, v.openebsVersion)
+	return err
 }
 
 // getVersion is a wrapper over fetchAndSetVersion