diff --git a/weed/command/filer.go b/weed/command/filer.go
index 8ed5114de..e056fbcf6 100644
--- a/weed/command/filer.go
+++ b/weed/command/filer.go
@@ -511,7 +511,10 @@ func (fo *FilerOptions) startFiler() {
 			ClientCAs:      caCertPool,
 		}
 
-		security.FixTlsConfig(util.GetViper(), tlsConfig)
+		err = security.FixTlsConfig(util.GetViper(), tlsConfig)
+		if err != nil {
+			glog.Fatalf("Filer failed to fix TLS config: %v", err)
+		}
 
 		var localTLSServer *http.Server
 		if filerLocalListener != nil {
@@ -534,10 +537,16 @@ func (fo *FilerOptions) startFiler() {
 			shutdownCtx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
 			defer cancel()
 			if socketServer != nil {
-				socketServer.Shutdown(shutdownCtx)
+				err = socketServer.Shutdown(shutdownCtx)
+				if err != nil {
+					glog.Warningf("socket server shutdown: %v", err)
+				}
 			}
 			if localTLSServer != nil {
-				localTLSServer.Shutdown(shutdownCtx)
+				err = localTLSServer.Shutdown(shutdownCtx)
+				if err != nil {
+					glog.Warningf("local TLS server shutdown: %v", err)
+				}
 			}
 			if err := httpS.Shutdown(shutdownCtx); err != nil {
 				glog.Warningf("HTTPS server shutdown: %v", err)
diff --git a/weed/command/filer_backup.go b/weed/command/filer_backup.go
index f3d4b32b6..040a90326 100644
--- a/weed/command/filer_backup.go
+++ b/weed/command/filer_backup.go
@@ -161,11 +161,13 @@ func doFilerBackup(grpcDialOption grpc.DialOption, backupOption *FilerBackupOpti
 
 	// create filer sink
 	filerSource := &source.FilerSource{}
-	filerSource.DoInitialize(
+	if err := filerSource.DoInitialize(
 		sourceFiler.ToHttpAddress(),
 		sourceFiler.ToGrpcAddress(),
 		sourcePath,
-		*backupOption.proxyByFiler)
+		*backupOption.proxyByFiler); err != nil {
+		return fmt.Errorf("filersource initialization failed: %v", err)
+	}
 
 	if err := repl_util.InitializeSSEForReplication(filerSource); err != nil {
 		return fmt.Errorf("SSE initialization failed: %v", err)
diff --git a/weed/command/fix.go b/weed/command/fix.go
index 34dee3732..b01eb9752 100644
--- a/weed/command/fix.go
+++ b/weed/command/fix.go
@@ -195,7 +195,9 @@ func doFixOneVolume(basepath string, baseFileName string, collection string, vol
 		if *fixIgnoreError {
 			glog.Error(err)
 		} else {
-			os.Remove(indexFileName)
+			if err := os.Remove(indexFileName); err != nil {
+				glog.Errorf("failed to cleanup file %s:%v", indexFileName, err)
+			}
 			glog.Fatal(err)
 		}
 	}
diff --git a/weed/command/fuse_std.go b/weed/command/fuse_std.go
index 7a5400dc5..2e4c88f87 100644
--- a/weed/command/fuse_std.go
+++ b/weed/command/fuse_std.go
@@ -243,7 +243,9 @@ func runFuse(cmd *Command, args []string) bool {
 		case "fusermount.path":
 			fusermountPath = parameter.value
 		case "config_dir":
-			util.ConfigurationFileDirectory.Set(parameter.value)
+			if err := util.ConfigurationFileDirectory.Set(parameter.value); err != nil {
+				panic(fmt.Errorf("config_dir %s: %w", parameter.value, err))
+			}
 		// FUSE performance options
 		case "writebackCache":
 			if parsed, err := strconv.ParseBool(parameter.value); err == nil {
diff --git a/weed/command/master.go b/weed/command/master.go
index bd4a0e6cc..80bba5fca 100644
--- a/weed/command/master.go
+++ b/weed/command/master.go
@@ -148,7 +148,9 @@ func runMaster(cmd *Command, args []string) bool {
 
 	parent, _ := util.FullPath(*m.metaFolder).DirAndName()
 	if util.FileExists(string(parent)) && !util.FileExists(*m.metaFolder) {
-		os.MkdirAll(*m.metaFolder, 0755)
+		if err := os.MkdirAll(*m.metaFolder, 0755); err != nil {
+			glog.Fatalf("Could not create Meta Folder %s: %v", *m.metaFolder, err)
+		}
 	}
 	if err := util.TestFolderWritable(util.ResolvePath(*m.metaFolder)); err != nil {
 		glog.Fatalf("Check Meta Folder (-mdir) Writable %s : %s", *m.metaFolder, err)
@@ -324,7 +326,9 @@ func startMaster(masterOption MasterOptions, masterWhiteList []string) {
 	var tlsConfig *tls.Config
 	if useMTLS {
 		tlsConfig = security.LoadClientTLSHTTP(clientCertFile)
-		security.FixTlsConfig(util.GetViper(), tlsConfig)
+		if err := security.FixTlsConfig(util.GetViper(), tlsConfig); err != nil {
+			glog.Fatalf("failed to fix TLS config: %v", err)
+		}
 	}
 
 	if useTLS {
diff --git a/weed/command/mini.go b/weed/command/mini.go
index 9b25ae33e..60989ff45 100644
--- a/weed/command/mini.go
+++ b/weed/command/mini.go
@@ -82,11 +82,11 @@ var (
 //     goroutines (registered via onMiniClientsShutdown / trackMiniClient) to
 //     drain.
 type miniClientsState struct {
-	ctx           context.Context
-	cancel        context.CancelFunc
-	wg            sync.WaitGroup
-	preCancelMu   sync.Mutex
-	preCancelFns  []func()
+	ctx          context.Context
+	cancel       context.CancelFunc
+	wg           sync.WaitGroup
+	preCancelMu  sync.Mutex
+	preCancelFns []func()
 }
 
 var miniClients *miniClientsState
@@ -807,8 +807,11 @@ func applyConfigFileOptions(options map[string]string) {
 		if flag != nil {
 			// Only set if not already set (by command line)
 			if flag.Value.String() == flag.DefValue {
-				flag.Value.Set(value)
-				glog.V(2).Infof("Applied config file option: %s=%s", key, value)
+				if err := flag.Value.Set(value); err != nil {
+					glog.Warningf("Failed to apply config file option: %s=%s: %v", key, value, err)
+				} else {
+					glog.V(2).Infof("Applied config file option: %s=%s", key, value)
+				}
 			}
 		}
 	}
@@ -1021,7 +1024,9 @@ func runMini(cmd *Command, args []string) bool {
 	printWelcomeMessage()
 
 	// Save configuration to file for persistence and documentation
-	saveMiniConfiguration(*miniDataFolders)
+	if err := saveMiniConfiguration(*miniDataFolders); err != nil {
+		glog.Warningf("failed to save mini configuration in %s: %v", *miniDataFolders, err)
+	}
 
 	if MiniClusterCtx != nil {
 		<-MiniClusterCtx.Done()
diff --git a/weed/command/mount_std.go b/weed/command/mount_std.go
index e7c5cfe83..35bbe36df 100644
--- a/weed/command/mount_std.go
+++ b/weed/command/mount_std.go
@@ -166,7 +166,9 @@ func RunMount(option *MountOptions, umask os.FileMode) bool {
 		return false
 	}
 
-	unmount.Unmount(dir)
+	if err := unmount.Unmount(dir); err != nil {
+		glog.V(1).Infof("pre-mount cleanup unmount %s: %v", dir, err)
+	}
 
 	// start on local unix socket
 	if *option.localSocket == "" {
@@ -186,7 +188,9 @@ func RunMount(option *MountOptions, umask os.FileMode) bool {
 
 	// detect mount folder mode
 	if *option.dirAutoCreate {
-		os.MkdirAll(dir, os.FileMode(0777)&^umask)
+		if err := os.MkdirAll(dir, os.FileMode(0777)&^umask); err != nil {
+			glog.Fatalf("failed to create directory %s:%v", dir, err)
+		}
 	}
 	fileInfo, err := os.Stat(dir)
 
@@ -357,8 +361,8 @@ func RunMount(option *MountOptions, umask os.FileMode) bool {
 		WritebackCache:        option.writebackCache != nil && *option.writebackCache,
 		PosixDirNlink:         option.posixDirNlink != nil && *option.posixDirNlink,
 		// Peer chunk sharing
-		PeerEnabled:   option.peerEnabled != nil && *option.peerEnabled,
-		PeerListen:    peerStringOrEmpty(option.peerListen),
+		PeerEnabled:    option.peerEnabled != nil && *option.peerEnabled,
+		PeerListen:     peerStringOrEmpty(option.peerListen),
 		PeerAdvertise:  peerStringOrEmpty(option.peerAdvertise),
 		PeerDataCenter: peerStringOrEmpty(option.peerDataCenter),
 		PeerRack:       peerStringOrEmpty(option.peerRack),
@@ -381,7 +385,9 @@ func RunMount(option *MountOptions, umask os.FileMode) bool {
 		glog.Fatalf("Mount fail: %v", err)
 	}
 	grace.OnInterrupt(func() {
-		unmount.Unmount(dir)
+		if err := unmount.Unmount(dir); err != nil {
+			glog.Errorf("failed to unmount %s: %v", dir, err)
+		}
 	})
 
 	if mountOptions.fuseCommandPid != 0 {
diff --git a/weed/command/mq_agent.go b/weed/command/mq_agent.go
index d9c6170a3..65e9a166e 100644
--- a/weed/command/mq_agent.go
+++ b/weed/command/mq_agent.go
@@ -3,6 +3,7 @@ package command
 import (
 	"github.com/seaweedfs/seaweedfs/weed/mq/agent"
 	"github.com/seaweedfs/seaweedfs/weed/pb/mq_agent_pb"
+	"google.golang.org/grpc"
 	"google.golang.org/grpc/reflection"
 
 	"github.com/seaweedfs/seaweedfs/weed/glog"
@@ -84,7 +85,9 @@ func (mqAgentOpt *MessageQueueAgentOptions) startQueueAgent() bool {
 	}
 
 	glog.Infof("Start Seaweed Message Queue Agent on %s:%d", *mqAgentOpt.ip, *mqAgentOpt.port)
-	grpcS.Serve(grpcL)
+	if err := grpcS.Serve(grpcL); err != nil && err != grpc.ErrServerStopped {
+		glog.Errorf("MQ Agent failed to start: %v", err)
+	}
 
 	return true
 
diff --git a/weed/command/mq_broker.go b/weed/command/mq_broker.go
index 3b6057548..8e3b198c5 100644
--- a/weed/command/mq_broker.go
+++ b/weed/command/mq_broker.go
@@ -1,6 +1,7 @@
 package command
 
 import (
+	"google.golang.org/grpc"
 	"google.golang.org/grpc/reflection"
 
 	"github.com/seaweedfs/seaweedfs/weed/glog"
@@ -109,14 +110,16 @@ func (mqBrokerOpt *MessageQueueBrokerOptions) startQueueServer() bool {
 		reflection.Register(localGrpcS)
 		go func() {
 			glog.V(0).Infof("MQ Broker listening on localhost:%d", *mqBrokerOpt.port)
-			if err := localGrpcS.Serve(localL); err != nil {
+			if err := localGrpcS.Serve(localL); err != nil && err != grpc.ErrServerStopped {
 				glog.Errorf("MQ Broker localhost listener error: %v", err)
 			}
 		}()
 	}
 
 	glog.V(0).Infof("MQ Broker listening on %s:%d", *mqBrokerOpt.ip, *mqBrokerOpt.port)
-	grpcS.Serve(grpcL)
+	if err := grpcS.Serve(grpcL); err != nil && err != grpc.ErrServerStopped {
+		glog.Errorf("Failed to serve MQ Broker: %v", err)
+	}
 
 	return true
 
diff --git a/weed/command/s3.go b/weed/command/s3.go
index 89e916cad..06d3700ea 100644
--- a/weed/command/s3.go
+++ b/weed/command/s3.go
@@ -364,7 +364,9 @@ func (s3opt *S3Options) startS3Server() bool {
 			if err != nil {
 				glog.Fatalf("Failed to listen on %s: %v", localSocket, err)
 			}
-			newHttpServer(router, nil).Serve(s3SocketListener)
+			if err := newHttpServer(router, nil).Serve(s3SocketListener); err != nil && err != http.ErrServerClosed {
+				glog.Fatalf("Failed to start S3 http server: %v", err)
+			}
 		}()
 	}
 
diff --git a/weed/command/volume.go b/weed/command/volume.go
index 137b4b747..ccb9a55a1 100644
--- a/weed/command/volume.go
+++ b/weed/command/volume.go
@@ -480,7 +480,9 @@ func (v VolumeServerOptions) startClusterHttpService(handler http.Handler) (http
 	if viper.GetString("https.volume.ca") != "" {
 		clientCertFile := viper.GetString("https.volume.ca")
 		httpS.TLSConfig = security.LoadClientTLSHTTP(clientCertFile)
-		security.FixTlsConfig(util.GetViper(), httpS.TLSConfig)
+		if err := security.FixTlsConfig(util.GetViper(), httpS.TLSConfig); err != nil {
+			glog.Fatalf("Could not fix TLS config: %v", err)
+		}
 	}
 
 	var closeCert func()