diff --git a/acquisition/acquisition.go b/acquisition/acquisition.go
index d360d35..e01799a 100644
--- a/acquisition/acquisition.go
+++ b/acquisition/acquisition.go
@@ -232,9 +232,8 @@ func (a *Acquisition) HashFiles() error {
 	defer csvFile.Close()
 
 	csvWriter := csv.NewWriter(csvFile)
-	defer csvWriter.Flush()
 
-	_ = filepath.Walk(a.StoragePath, func(filePath string, fileInfo os.FileInfo, err error) error {
+	walkErr := filepath.Walk(a.StoragePath, func(filePath string, fileInfo os.FileInfo, err error) error {
 		if err != nil {
 			return err
 		}
@@ -250,15 +249,15 @@ func (a *Acquisition) HashFiles() error {
 			return err
 		}
 
-		err = csvWriter.Write([]string{filePath, sha256})
-		if err != nil {
-			return err
-		}
-
-		return nil
+		return csvWriter.Write([]string{filePath, sha256})
 	})
 
-	return nil
+	csvWriter.Flush()
+	if err := csvWriter.Error(); err != nil {
+		return err
+	}
+
+	return walkErr
 }
 
 func (a *Acquisition) StoreInfo() error {