diff --git a/registry/storage/garbagecollect.go b/registry/storage/garbagecollect.go
index 48d428a8..317c792d 100644
--- a/registry/storage/garbagecollect.go
+++ b/registry/storage/garbagecollect.go
@@ -98,15 +98,13 @@ func MarkAndSweep(ctx context.Context, storageDriver driver.StorageDriver, regis
 			return nil
 		})
 
-		if err != nil {
-			// In certain situations such as unfinished uploads, deleting all
-			// tags in S3 or removing the _manifests folder manually, this
-			// error may be of type PathNotFound.
-			//
-			// In these cases we can continue marking other manifests safely.
-			if _, ok := err.(driver.PathNotFoundError); ok {
-				return nil
-			}
+		// In certain situations such as unfinished uploads, deleting all
+		// tags in S3 or removing the _manifests folder manually, this
+		// error may be of type PathNotFound.
+		//
+		// In these cases we can continue marking other manifests safely.
+		if _, ok := err.(driver.PathNotFoundError); ok {
+			return nil
 		}
 
 		return err