diff --git a/internal/storage/storage_handle.go b/internal/storage/storage_handle.go
index c3ebed37dd..1bd29b3974 100644
--- a/internal/storage/storage_handle.go
+++ b/internal/storage/storage_handle.go
@@ -80,8 +80,7 @@ func createGRPCControlClientHandle(ctx context.Context, clientConfig *storageuti
 	var clientOpts []option.ClientOption
 	clientOpts, err = createClientOptionForGRPCClient(clientConfig)
 	if err != nil {
-		err = fmt.Errorf("Error in getting clientOpts for gRPC client: %w", err)
-		return
+		return nil, fmt.Errorf("Error in getting clientOpts for gRPC client: %w", err)
 	}
 	sc, err = control.NewStorageControlClient(ctx, clientOpts...)
 	if err != nil {
@@ -109,8 +108,7 @@ func createGRPCClientHandle(ctx context.Context, clientConfig *storageutil.Stora
 	var clientOpts []option.ClientOption
 	clientOpts, err = createClientOptionForGRPCClient(clientConfig)
 	if err != nil {
-		err = fmt.Errorf("Error in getting clientOpts for gRPC client: %w", err)
-		return
+		return nil, fmt.Errorf("Error in getting clientOpts for gRPC client: %w", err)
 	}
 
 	sc, err = storage.NewGRPCClient(ctx, clientOpts...)