diff --git a/common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/DefaultClusterVersionControlService.java b/common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/DefaultClusterVersionControlService.java
index 7d8e81d1c4..4d642be521 100644
--- a/common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/DefaultClusterVersionControlService.java
+++ b/common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/DefaultClusterVersionControlService.java
@@ -526,7 +526,8 @@ public class DefaultClusterVersionControlService extends TbApplicationEventListe
                 .setRequestIdLSB(ctx.getRequestId().getLeastSignificantBits());
         if (e.isPresent()) {
             log.debug("[{}][{}] Failed to process task", ctx.getTenantId(), ctx.getRequestId(), e.get());
-            builder.setError(e.get().getMessage());
+            var message = e.get().getMessage();
+            builder.setError(message != null ? message : e.get().getClass().getSimpleName());
         } else {
             if (enrichFunction != null) {
                 builder = enrichFunction.apply(builder);