diff --git a/tools/component/component.go b/tools/component/component.go
index 0cdd4e08e..bed5a0d48 100644
--- a/tools/component/component.go
+++ b/tools/component/component.go
@@ -243,7 +243,7 @@ func checkKafka(config *config.GlobalConfig) error {
 
 	for _, requiredTopic := range requiredTopics {
 		if !isTopicPresent(requiredTopic, topics) {
-			return errs.Wrap(err, fmt.Sprintf("Kafka doesn't contain topic: %v", requiredTopic))
+			return errs.WrapMsg(err, fmt.Sprintf("Kafka doesn't contain topic: %v", requiredTopic))
 		}
 	}
 
diff --git a/tools/formitychecker/checker/checker.go b/tools/formitychecker/checker/checker.go
index b17cc5427..03cff3613 100644
--- a/tools/formitychecker/checker/checker.go
+++ b/tools/formitychecker/checker/checker.go
@@ -41,7 +41,7 @@ func CheckDirectory(cfg *config.Config) error {
 	for _, targetDir := range cfg.TargetDirs {
 		err := filepath.Walk(targetDir, func(path string, info os.FileInfo, err error) error {
 			if err != nil {
-				return errs.Wrap(err, fmt.Sprintf("error walking directory '%s'", targetDir))
+				return errs.WrapMsg(err, fmt.Sprintf("error walking directory '%s'", targetDir))
 			}
 
 			// Skip if the directory is in the ignore list