1 files changed, 3 insertions, 1 deletions
diff --git a/src/org/traccar/database/ConnectionManager.java b/src/org/traccar/database/ConnectionManager.java
index 8a1debdfa..8796673b1 100644
--- a/src/org/traccar/database/ConnectionManager.java
+++ b/src/org/traccar/database/ConnectionManager.java
@@ -94,7 +94,9 @@ public class ConnectionManager {
                 if (status.equals(Device.STATUS_ONLINE)) {
                     event.setType(Event.TYPE_DEVICE_ONLINE);
                 }
-                Context.getNotificationManager().updateEvent(event, null);
+                if (Context.getNotificationManager() != null) {
+                    Context.getNotificationManager().updateEvent(event, null);
+                }
             }
             device.setStatus(status);