1 files changed, 5 insertions, 3 deletions
diff --git a/src/org/traccar/protocol/Tk103ProtocolDecoder.java b/src/org/traccar/protocol/Tk103ProtocolDecoder.java
index c638e7f27..d3bc0efdc 100644
--- a/src/org/traccar/protocol/Tk103ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Tk103ProtocolDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2012 - 2016 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -113,9 +113,11 @@ public class Tk103ProtocolDecoder extends BaseProtocolDecoder {
             String type = sentence.substring(12, 16);
             if (type.equals("BP00") || type.equals("BP05")) {
                 String content = sentence.substring(16);
-                getDeviceSession(channel, remoteAddress, content.substring(0, 15));
+                if (content.length() >= 15) {
+                    getDeviceSession(channel, remoteAddress, content.substring(0, 15));
+                }
                 if (type.equals("BP00")) {
-                    channel.write("(" + id + "AP01" + content.substring(15) + ")");
+                    channel.write("(" + id + "AP01HSO)");
                     return null;
                 } else if (type.equals("BP05")) {
                     channel.write("(" + id + "AP05)");