diff --git a/application/src/main/java/org/thingsboard/server/service/cf/AbstractCalculatedFieldProcessingService.java b/application/src/main/java/org/thingsboard/server/service/cf/AbstractCalculatedFieldProcessingService.java
index d4d7fd8bf8..b8f1822bab 100644
--- a/application/src/main/java/org/thingsboard/server/service/cf/AbstractCalculatedFieldProcessingService.java
+++ b/application/src/main/java/org/thingsboard/server/service/cf/AbstractCalculatedFieldProcessingService.java
@@ -174,9 +174,9 @@ public abstract class AbstractCalculatedFieldProcessingService {
             return future.get();
         } catch (ExecutionException e) {
             Throwable cause = e.getCause();
-            throw new RuntimeException("Failed to fetch " + key + ": " + cause.getMessage(), cause);
+            throw new RuntimeException("Failed to fetch '" + key + "' argument: " + cause.getMessage(), cause);
         } catch (InterruptedException e) {
-            throw new RuntimeException("Failed to fetch" + key, e);
+            throw new RuntimeException("Failed to fetch '" + key + "' argument!", e);
         }
     }
 
diff --git a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/geofencing/GeofencingZoneState.java b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/geofencing/GeofencingZoneState.java
index c849f5d169..ca4108570c 100644
--- a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/geofencing/GeofencingZoneState.java
+++ b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/geofencing/GeofencingZoneState.java
@@ -46,10 +46,13 @@ public class GeofencingZoneState {
     public GeofencingZoneState(EntityId zoneId, KvEntry entry) {
         this.zoneId = zoneId;
         if (!(entry instanceof AttributeKvEntry attributeKvEntry)) {
-            throw new IllegalArgumentException("Unsupported KvEntry type for geofencing zone state: " + entry.getClass().getSimpleName());
+            throw new IllegalArgumentException("Invalid perimeter data source for zone with id: " + zoneId + ". Perimeter definition must be stored as attribute!");
         }
         this.ts = attributeKvEntry.getLastUpdateTs();
         this.version = attributeKvEntry.getVersion();
+        if (entry.getValueAsString() == null) {
+            throw new IllegalArgumentException("Perimeter attribute key '" + entry.getKey() + "' not found for Zone with id: " + zoneId);
+        }
         this.perimeterDefinition = JacksonUtil.fromString(entry.getValueAsString(), PerimeterDefinition.class);
     }