1 files changed, 4 insertions, 6 deletions
diff --git a/src/org/traccar/protocol/TotemProtocolEncoder.java b/src/org/traccar/protocol/TotemProtocolEncoder.java
index fb8e762c5..1c870f63c 100644
--- a/src/org/traccar/protocol/TotemProtocolEncoder.java
+++ b/src/org/traccar/protocol/TotemProtocolEncoder.java
@@ -28,12 +28,10 @@ public class TotemProtocolEncoder extends StringProtocolEncoder {
     protected Object encodeCommand(Command command) {
 
         command.set(Command.KEY_DEVICE_PASSWORD, "000000");
-        if (Context.getDeviceManager() != null) {
-            Device device = Context.getDeviceManager().getDeviceById(command.getDeviceId());
-            if (device != null && device.getAttributes().containsKey(Command.KEY_DEVICE_PASSWORD)) {
-                command.set(Command.KEY_DEVICE_PASSWORD, device.getAttributes()
-                        .get(Command.KEY_DEVICE_PASSWORD).toString());
-                }
+        Device device = Context.getIdentityManager().getDeviceById(command.getDeviceId());
+        if (device.getAttributes().containsKey(Command.KEY_DEVICE_PASSWORD)) {
+            command.set(Command.KEY_DEVICE_PASSWORD, (String) device.getAttributes()
+                    .get(Command.KEY_DEVICE_PASSWORD));
         }
 
         switch (command.getType()) {