1 files changed, 3 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/AlematicsProtocolDecoder.java b/src/org/traccar/protocol/AlematicsProtocolDecoder.java
index 794588f5f..8909b8d5b 100644
--- a/src/org/traccar/protocol/AlematicsProtocolDecoder.java
+++ b/src/org/traccar/protocol/AlematicsProtocolDecoder.java
@@ -60,6 +60,8 @@ public class AlematicsProtocolDecoder extends BaseProtocolDecoder {
             .or()
             .number("(d+),")                     // extra mask
             .expression("(.*)")                  // extra data
+            .or()
+            .any()
             .groupEnd()
             .compile();
 
@@ -144,7 +146,7 @@ public class AlematicsProtocolDecoder extends BaseProtocolDecoder {
 
         if (parser.hasNext()) {
             position.set("text", parser.next());
-        } else {
+        } else if (parser.hasNext()) {
             decodeExtras(position, parser);
         }