diff --git a/pkg/uploader/block/snapshot.go b/pkg/uploader/block/snapshot.go
index b185f4e15..53e7e7f14 100644
--- a/pkg/uploader/block/snapshot.go
+++ b/pkg/uploader/block/snapshot.go
@@ -121,7 +121,10 @@ func snapshotSource(
 		return "", 0, errors.Wrapf(err, "Failed to run uploader backup for si %v", source)
 	}
 
-	snap.Tags = make(map[string]string)
+	if snap.Tags == nil {
+		snap.Tags = make(map[string]string)
+	}
+
 	snap.Tags[uploader.CBTChangeIDTag] = cbtSource.ChangeID
 	snap.Tags[uploader.CBTVolumeIDTag] = cbtSource.VolumeID
 	if snapshotTags != nil {
diff --git a/pkg/uploader/block/uploader.go b/pkg/uploader/block/uploader.go
index 0378f4f5b..8aa58bf96 100644
--- a/pkg/uploader/block/uploader.go
+++ b/pkg/uploader/block/uploader.go
@@ -155,7 +155,7 @@ func (blkup *blockUploader) Restore(snapshot udmrepo.Snapshot, dest destInfo, bi
 	}
 
 	if len(meta.SubObjects) != 1 {
-		return 0, errors.Wrapf(err, "unexpected number of bdev object (%d) for snapshot %s", len(meta.SubObjects), snapshot.Description)
+		return 0, errors.Errorf("unexpected number of bdev object (%d) for snapshot %s", len(meta.SubObjects), snapshot.Description)
 	}
 
 	sourceSize, err := getSourceSize(snapshot)
diff --git a/pkg/uploader/block/uploader_test.go b/pkg/uploader/block/uploader_test.go
index bb7c79c5a..79c7be954 100644
--- a/pkg/uploader/block/uploader_test.go
+++ b/pkg/uploader/block/uploader_test.go
@@ -483,7 +483,7 @@ func TestGetSourceSize(t *testing.T) {
 			name: "invalid tag value",
 			snapshot: udmrepo.Snapshot{
 				Tags: map[string]string{
-					"bdev-source-size": "abc",
+					bdevSourceSizeTag: "abc",
 				},
 			},
 			expectErr: true,
@@ -492,7 +492,7 @@ func TestGetSourceSize(t *testing.T) {
 			name: "valid tag value",
 			snapshot: udmrepo.Snapshot{
 				Tags: map[string]string{
-					"bdev-source-size": "1048576",
+					bdevSourceSizeTag: "1048576",
 				},
 			},
 			expectErr: false,
@@ -667,7 +667,7 @@ func TestBlockUploaderRestore(t *testing.T) {
 			Description: "test snapshot",
 			RootObject:  udmrepo.ObjectMetadata{ID: "root-id"},
 			Tags: map[string]string{
-				"bdev-source-size": "1048576",
+				bdevSourceSizeTag: "1048576",
 			},
 		}