diff --git a/weed/pb/grpc_client_server.go b/weed/pb/grpc_client_server.go
index c4e35618f..ef22aeded 100644
--- a/weed/pb/grpc_client_server.go
+++ b/weed/pb/grpc_client_server.go
@@ -86,13 +86,15 @@ func WithCachedGrpcClient(fn func(*grpc.ClientConn) error, address string, opts
 		err := fn(existingConnection)
 		if err != nil {
 			grpcClientsLock.Lock()
-			delete(grpcClients, address)
+			// delete(grpcClients, address)
 			grpcClientsLock.Unlock()
-			existingConnection.Close()
+			// println("closing existing connection to", existingConnection.Target())
+			// existingConnection.Close()
 		}
 		return err
 	}
 
+	println(" dialing to", address, "...")
 	grpcConnection, err := GrpcDial(context.Background(), address, opts...)
 	if err != nil {
 		grpcClientsLock.Unlock()
@@ -105,9 +107,10 @@ func WithCachedGrpcClient(fn func(*grpc.ClientConn) error, address string, opts
 	err = fn(grpcConnection)
 	if err != nil {
 		grpcClientsLock.Lock()
-		delete(grpcClients, address)
+		// delete(grpcClients, address)
 		grpcClientsLock.Unlock()
-		grpcConnection.Close()
+		// println("closing created new connection to", grpcConnection.Target())
+		// grpcConnection.Close()
 	}
 
 	return err
diff --git a/weed/wdclient/masterclient.go b/weed/wdclient/masterclient.go
index f73853c78..4f8e0d5ef 100644
--- a/weed/wdclient/masterclient.go
+++ b/weed/wdclient/masterclient.go
@@ -121,6 +121,9 @@ func (mc *MasterClient) tryConnectToMaster(master string) (nextHintedLeader stri
 }
 
 func (mc *MasterClient) WithClient(fn func(client master_pb.SeaweedClient) error) error {
+	for mc.currentMaster == "" {
+		time.Sleep(3 * time.Second)
+	}
 	return pb.WithMasterClient(mc.currentMaster, mc.grpcDialOption, func(client master_pb.SeaweedClient) error {
 		return fn(client)
 	})