1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/database/NotificationManager.java b/src/org/traccar/database/NotificationManager.java
index 7593367a3..ab6b2230a 100644
--- a/src/org/traccar/database/NotificationManager.java
+++ b/src/org/traccar/database/NotificationManager.java
@@ -41,8 +41,8 @@ public class NotificationManager {
 
         Set<Long> users = Context.getPermissionsManager().getDeviceUsers(event.getDeviceId());
         for (Long userId : users) {
-            if (event.getGeofenceId() == 0
-                    || Context.getGeofenceManager().checkGeofence(userId, event.getGeofenceId())) {
+            if (event.getGeofenceId() == 0 || Context.getGeofenceManager() != null
+                    && Context.getGeofenceManager().checkGeofence(userId, event.getGeofenceId())) {
                 Context.getConnectionManager().updateEvent(userId, event, position);
             }
         }