diff --git a/mount/mountinfo_linux.go b/mount/mountinfo_linux.go
index a7407c50e..d089890fe 100644
--- a/mount/mountinfo_linux.go
+++ b/mount/mountinfo_linux.go
@@ -45,10 +45,6 @@ func parseInfoFile(r io.Reader) ([]Info, error) {
 	out := []Info{}
 	var err error
 	for s.Scan() {
-		if err = s.Err(); err != nil {
-			return nil, err
-		}
-
 		/*
 		   See http://man7.org/linux/man-pages/man5/proc.5.html
 
@@ -128,6 +124,10 @@ func parseInfoFile(r io.Reader) ([]Info, error) {
 
 		out = append(out, p)
 	}
+	if err = s.Err(); err != nil {
+		return nil, err
+	}
+
 	return out, nil
 }
 
diff --git a/oci/spec_opts.go b/oci/spec_opts.go
index 59dbfdb19..89346fe8b 100644
--- a/oci/spec_opts.go
+++ b/oci/spec_opts.go
@@ -1238,11 +1238,11 @@ func WithEnvFile(path string) SpecOpts {
 
 		sc := bufio.NewScanner(f)
 		for sc.Scan() {
-			if sc.Err() != nil {
-				return sc.Err()
-			}
 			vars = append(vars, sc.Text())
 		}
+		if err = sc.Err(); err != nil {
+			return err
+		}
 		return WithEnv(vars)(nil, nil, nil, s)
 	}
 }
diff --git a/runtime/v2/README.md b/runtime/v2/README.md
index 76d30373f..aaa878bfd 100644
--- a/runtime/v2/README.md
+++ b/runtime/v2/README.md
@@ -227,9 +227,6 @@ func copy(wg *sync.WaitGroup, r io.Reader, pri journal.Priority, vars map[string
 	defer wg.Done()
 	s := bufio.NewScanner(r)
 	for s.Scan() {
-		if s.Err() != nil {
-			return
-		}
 		journal.Send(s.Text(), pri, vars)
 	}
 }