diff --git a/pkg/util/log/log.go b/pkg/util/log/log.go
index 9924cba227..fef2e3d83d 100644
--- a/pkg/util/log/log.go
+++ b/pkg/util/log/log.go
@@ -169,8 +169,9 @@ func CheckFatal(location string, err error, logger log.Logger) {
 	fmt.Fprintln(os.Stderr, errStr)
 
 	logger.Log("err", errStr)
-	err = Flush()
-	fmt.Fprintln(os.Stderr, "Could not flush logger", err)
+	if err = Flush(); err != nil {
+		fmt.Fprintln(os.Stderr, "Could not flush logger", err)
+	}
 	os.Exit(1)
 }