1 files changed, 6 insertions, 3 deletions
diff --git a/src/org/traccar/notification/PropertiesProvider.java b/src/org/traccar/notification/PropertiesProvider.java
index 1a4104d2b..c5ba688e8 100644
--- a/src/org/traccar/notification/PropertiesProvider.java
+++ b/src/org/traccar/notification/PropertiesProvider.java
@@ -51,10 +51,13 @@ public class PropertiesProvider {
     public int getInteger(String key, int defaultValue) {
         if (config != null) {
             return config.getInteger(key, defaultValue);
-        } else if (extendedModel.getAttributes().containsKey(key)) {
-            return Integer.parseInt(extendedModel.getAttributes().get(key).toString());
         } else {
-            return defaultValue;
+            Object result = extendedModel.getAttributes().get(key);
+            if (result != null) {
+                return result instanceof String ? Integer.parseInt((String) result) : (Integer) result;
+            } else {
+                return defaultValue;
+            }
         }
     }