1 files changed, 2 insertions, 1 deletions
diff --git a/src/org/traccar/helper/Parser.java b/src/org/traccar/helper/Parser.java
index 73713c51c..dcea1c8f7 100644
--- a/src/org/traccar/helper/Parser.java
+++ b/src/org/traccar/helper/Parser.java
@@ -46,7 +46,8 @@ public class Parser {
     }
 
     public boolean hasNext(int number) {
-        if (matcher.group(position) != null) {
+        String value = matcher.group(position);
+        if (value != null && !value.isEmpty()) {
             return true;
         } else {
             position += number;