diff --git a/core/commands/add.go b/core/commands/add.go
index 9ee5f7d8d..80697d285 100644
--- a/core/commands/add.go
+++ b/core/commands/add.go
@@ -99,7 +99,11 @@ remains to be implemented.
 
 			for {
 				file, err := req.Files().NextFile()
-				if (err != nil && err != io.EOF) || file == nil {
+				if err != nil && err != io.EOF {
+					res.SetError(err, cmds.ErrNormal)
+					return
+				}
+				if file == nil { // done
 					return
 				}