diff --git a/s3store/s3store.go b/s3store/s3store.go
index 1f87714..0f92f00 100644
--- a/s3store/s3store.go
+++ b/s3store/s3store.go
@@ -364,7 +364,7 @@ func (store S3Store) GetInfo(id string) (info tusd.FileInfo, err error) {
 		Key:    store.keyWithPrefix(uploadId + ".part"),
 	})
 	if err != nil {
-		if !isAwsError(err, s3.ErrCodeNoSuchKey) && !isAwsError(err, "AccessDenied") {
+		if !isAwsError(err, s3.ErrCodeNoSuchKey) && !isAwsError(err, "NotFound") && !isAwsError(err, "AccessDenied") {
 			return info, err
 		}
 
diff --git a/s3store/s3store_test.go b/s3store/s3store_test.go
index 57c7d22..fee6ecd 100644
--- a/s3store/s3store_test.go
+++ b/s3store/s3store_test.go
@@ -381,9 +381,7 @@ func TestDeclareLength(t *testing.T) {
 		s3obj.EXPECT().HeadObject(&s3.HeadObjectInput{
 			Bucket: aws.String("bucket"),
 			Key:    aws.String("uploadId.part"),
-		}).Return(&s3.HeadObjectOutput{
-			ContentLength: aws.Int64(0),
-		}, nil),
+		}).Return(&s3.HeadObjectOutput{}, awserr.New("NotFound", "Not Found", nil)),
 		s3obj.EXPECT().PutObject(&s3.PutObjectInput{
 			Bucket:        aws.String("bucket"),
 			Key:           aws.String("uploadId.info"),