diff --git a/internal/pkg/util/util.go b/internal/pkg/util/util.go
index 4148bf1b..0f34e571 100644
--- a/internal/pkg/util/util.go
+++ b/internal/pkg/util/util.go
@@ -20,6 +20,16 @@ import (
 	"github.com/pkg/errors"
 )
 
+func FirstError(errs ...error) (err error) {
+	for _, e := range errs {
+		if err == nil {
+			err = e
+		}else if e != nil {
+			wwlog.ErrorExc(e, "Unhandled error")
+		}
+	}
+}
+
 func DirModTime(path string) (time.Time, error) {
 
 	var lastTime time.Time
@@ -196,17 +206,17 @@ func FindFilterFiles(
 	path string,
 	include []string,
 	ignore []string,
-	ignore_xdev bool) ([]string, error) {
+	ignore_xdev bool) (ofiles []string, err error) {
 
 	wwlog.Debug("Finding files: %s", path)
 
-	ofiles := []string{}
-
 	cwd, err := os.Getwd()
 	if err != nil {
 		return ofiles, err
 	}
-	defer os.Chdir(cwd)
+	defer func() {
+		err = FirstError(err, os.Chdir(cwd))
+	}()
 
 	err = os.Chdir(path)
 	if err != nil {
@@ -247,7 +257,12 @@ func FindFilterFiles(
 	dev := path_stat.Sys().(*syscall.Stat_t).Dev
 
 	for _, ifile := range files {
-		if stat, err := os.Stat(ifile); err == nil && stat.IsDir() {
+		stat, err := os.Stat(ifile)
+		if err != nil {
+			return ofiles, err
+		}
+
+		if stat.IsDir() {
 			// recursivly include from the matched directory
 
 			num_init := len(ofiles)
@@ -498,7 +513,7 @@ func CpioCreate(
 	ifiles []string,
 	ofile string,
 	format string,
-	cpio_args ...string ) error {
+	cpio_args ...string ) (err error) {
 
 	args := []string{
 		"--quiet",
@@ -515,9 +530,10 @@ func CpioCreate(
 		return err
 	}
 
+	var err_in error
 	go func() {
 		defer stdin.Close()
-		io.WriteString(stdin, strings.Join(ifiles, "\n"))
+		_, err_in := io.WriteString(stdin, strings.Join(ifiles, "\n"))
 	}()
 
 	out, err := proc.CombinedOutput()
@@ -525,14 +541,14 @@ func CpioCreate(
 		wwlog.Debug(string(out))
 	}
 
-	return err
+	return FirstError(err, err_in)
 }
 
 /*******************************************************************************
 	Compress a file using gzip or pigz
 */
 func FileGz(
-	file string ) error {
+	file string ) (err error) {
 
 	file_gz := file + ".gz"
 
@@ -540,7 +556,7 @@ func FileGz(
 		err := os.Remove(file_gz)
 
 		if err != nil {
-			return errors.Wrapf(err, "Could not remove existing file: ", file_gz)
+			return errors.Wrapf(err, "Could not remove existing file: %s", file_gz)
 		}
 	}
 
@@ -576,9 +592,9 @@ func BuildFsImage(
 	ignore []string,
 	ignore_xdev bool,
 	format string,
-	cpio_args ...string ) error {
+	cpio_args ...string ) (err error) {
 
-	err := os.MkdirAll(path.Dir(imagePath), 0755)
+	err = os.MkdirAll(path.Dir(imagePath), 0755)
 	if err != nil {
 		return errors.Wrapf(err, "Failed to create image directory for %s: %s", name, imagePath)
 	}
@@ -597,7 +613,9 @@ func BuildFsImage(
 	if err != nil {
 		return err
 	}
-	defer os.Chdir(cwd)
+	defer func() {
+		err = FirstError(err, os.Chdir(cwd))
+	}()
 
 	err = os.Chdir(rootfsPath)
 	if err != nil {
diff --git a/internal/pkg/warewulfd/provision.go b/internal/pkg/warewulfd/provision.go
index 62be3faf..5ed383e5 100644
--- a/internal/pkg/warewulfd/provision.go
+++ b/internal/pkg/warewulfd/provision.go
@@ -236,7 +236,10 @@ func ProvisionSend(w http.ResponseWriter, req *http.Request) {
 
 			w.Header().Set("Content-Type", "text")
 			w.Header().Set("Content-Length", strconv.Itoa(buf.Len()))
-			buf.WriteTo(w)
+			_, err = buf.WriteTo(w)
+			if err != nil {
+				wwlog.ErrorExc(err, "")
+			}
 
 			wwlog.Info("SEND:  %15s: %s", node.Id.Get(), stage_file)
 
diff --git a/internal/pkg/warewulfd/util.go b/internal/pkg/warewulfd/util.go
index 16fad483..13ebd310 100644
--- a/internal/pkg/warewulfd/util.go
+++ b/internal/pkg/warewulfd/util.go
@@ -46,9 +46,9 @@ func sendFile(w http.ResponseWriter, filename string, sendto string) error {
 	w.Header().Set("Content-Disposition", "attachment; filename=kernel")
 	w.Header().Set("Content-Type", FileContentType)
 	w.Header().Set("Content-Length", FileSize)
-	buf.WriteTo(w)
+	_, err = buf.WriteTo(w)
 
 	wwlog.Info("SEND:  %15s: %s", sendto, filename)
 
-	return nil
+	return err
 }
diff --git a/internal/pkg/wwlog/wwlog.go b/internal/pkg/wwlog/wwlog.go
index d8b94ded..2ddb18f1 100644
--- a/internal/pkg/wwlog/wwlog.go
+++ b/internal/pkg/wwlog/wwlog.go
@@ -190,9 +190,9 @@ func recordLog(level int, err error, message string, a ...interface{}) {
 		message = logFormatter(logLevel, &rec)
 
 		if level >= ERROR {
-			fmt.Fprintf(logErr, message)
+			fmt.Fprint(logErr, message)
 		} else {
-			fmt.Fprintf(logOut, message)
+			fmt.Fprint(logOut, message)
 		}
 	}
 }