Merge pull request #5095 from merabtenei/attributes-NullPointerException

fix NullPointerException when attribute key is defined and value is null

1 files changed, 2 insertions, 1 deletions

diff --git a/src/main/java/org/traccar/model/ExtendedModel.java b/src/main/java/org/traccar/model/ExtendedModel.java
index 6a4f502f7..d5cd094da 100644
--- a/src/main/java/org/traccar/model/ExtendedModel.java
+++ b/src/main/java/org/traccar/model/ExtendedModel.java
@@ -91,7 +91,8 @@ public class ExtendedModel extends BaseModel {
 
     public String getString(String key, String defaultValue) {
         if (attributes.containsKey(key)) {
-            return attributes.get(key).toString();
+            Object value = attributes.get(key);
+            return value != null ? value.toString() : null;
         } else {
             return defaultValue;
         }