diff --git a/pkg/blockstorage/awsebs/awsebs.go b/pkg/blockstorage/awsebs/awsebs.go
index d954b681d2..de12211820 100644
--- a/pkg/blockstorage/awsebs/awsebs.go
+++ b/pkg/blockstorage/awsebs/awsebs.go
@@ -530,7 +530,7 @@ func getSnapshots(ctx context.Context, ec2Cli *EC2, snapIDs []*string) ([]*ec2.S
 	dsi := &ec2.DescribeSnapshotsInput{SnapshotIds: snapIDs}
 	dso, err := ec2Cli.DescribeSnapshotsWithContext(ctx, dsi)
 	if err != nil {
-		return nil, errors.Wrapf(err, "Failed to get snapshot, snapshot_ids: %p", snapIDs)
+		return nil, errors.Wrapf(err, blockstorage.SnapshotDoesNotExistError+", snapshot_ids: %p", snapIDs)
 	}
 	// TODO: handle paging and continuation
 	if len(dso.Snapshots) != len(snapIDs) {
diff --git a/pkg/blockstorage/blockstorage_test.go b/pkg/blockstorage/blockstorage_test.go
index f8ff7eaf92..a959bb3c3b 100644
--- a/pkg/blockstorage/blockstorage_test.go
+++ b/pkg/blockstorage/blockstorage_test.go
@@ -143,7 +143,7 @@ func (s *BlockStorageProviderSuite) TestCreateSnapshot(c *C) {
 		s.snapshots = nil
 		_, err = s.provider.SnapshotGet(context.Background(), snapshot.ID)
 		c.Assert(err, NotNil)
-		c.Assert(err.Error(), Matches, blockstorage.SnapshotDoesNotExistError)
+		c.Assert(strings.Contains(err.Error(), blockstorage.SnapshotDoesNotExistError), Equals, true)
 	}
 }