diff --git a/source/src/command.cpp b/source/src/command.cpp
index 9d03cff8..472df428 100644
--- a/source/src/command.cpp
+++ b/source/src/command.cpp
@@ -767,7 +767,12 @@ void explodelist(const char *s, vector<char *> &elems)
 char *indexlist(const char *s, int pos)
 {
     whitespaceskip;
-    loopi(pos) elementskip, whitespaceskip;
+    loopi(pos)
+    {
+        elementskip;
+        whitespaceskip;
+        if(!*s) break;
+    }
     const char *e = s;
     elementskip;
     if(*e=='"')