1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/org/traccar/session/ConnectionManager.java b/src/main/java/org/traccar/session/ConnectionManager.java
index c8c07f9c7..6d5fefa75 100644
--- a/src/main/java/org/traccar/session/ConnectionManager.java
+++ b/src/main/java/org/traccar/session/ConnectionManager.java
@@ -128,7 +128,7 @@ public class ConnectionManager {
             if (oldSession != null) {
                 Endpoint oldEndpoint = new Endpoint(oldSession.getChannel(), oldSession.getRemoteAddress());
                 Map<String, DeviceSession> oldEndpointSessions = sessionsByEndpoint.get(oldEndpoint);
-                if (oldEndpointSessions.size() > 1) {
+                if (oldEndpointSessions != null && oldEndpointSessions.size() > 1) {
                     oldEndpointSessions.remove(device.getUniqueId());
                 } else {
                     sessionsByEndpoint.remove(oldEndpoint);