diff --git a/go/pkg/cas/upload.go b/go/pkg/cas/upload.go
index b0937e04..ffb46891 100644
--- a/go/pkg/cas/upload.go
+++ b/go/pkg/cas/upload.go
@@ -562,10 +562,13 @@ func (u *uploader) visitPath(ctx context.Context, absPath string, info os.FileIn
 		// Ignore all non-expected modes (e.g. domain sockets as used by git
 		// fsmonitor).
 		default:
-			return nil, nil
+			return nil, ErrSkip
 		}
 	})
-	if err != nil {
+	switch {
+	case errors.Is(err, ErrSkip):
+		return nil, nil
+	case err != nil:
 		return nil, err
 	}
 	return cached.(*digested), nil