diff --git a/model/puller.go b/model/puller.go
index d375cc601..fc25f4fc5 100644
--- a/model/puller.go
+++ b/model/puller.go
@@ -220,6 +220,10 @@ func (p *puller) fixupDirectories() {
 	var changed = 0
 
 	var walkFn = func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+
 		if !info.IsDir() {
 			return nil
 		}