X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/959f37498c5f1610612452ab227ba4680b30e8e6..8a56164a8a9d3c7b3b58df77d1e5aa3f1d6cad12:/services/keepstore/s3_volume.go

diff --git a/services/keepstore/s3_volume.go b/services/keepstore/s3_volume.go
index d068b2a6e5..80a7c89f2e 100644
--- a/services/keepstore/s3_volume.go
+++ b/services/keepstore/s3_volume.go
@@ -10,6 +10,7 @@ import (
 	"net/http"
 	"os"
 	"regexp"
+	"strings"
 	"time"
 
 	"github.com/AdRoll/goamz/aws"
@@ -310,7 +311,8 @@ func (v *S3Volume) isKeepBlock(s string) bool {
 func (v *S3Volume) translateError(err error) error {
 	switch err := err.(type) {
 	case *s3.Error:
-		if err.StatusCode == http.StatusNotFound && err.Code == "NoSuchKey" {
+		if (err.StatusCode == http.StatusNotFound && err.Code == "NoSuchKey") ||
+			strings.Contains(err.Error(), "Not Found") {
 			return os.ErrNotExist
 		}
 		// Other 404 errors like NoSuchVersion and