diff --git a/common/cmdlib.c b/common/cmdlib.c
index 56fc09af..2d213a44 100644
--- a/common/cmdlib.c
+++ b/common/cmdlib.c
@@ -296,7 +296,9 @@ COM_Parse(char *data)
     if (c == '\"') {
 	data++;
 	do {
-	    c = *data++;
+	    c = *data;
+	    if (c)
+		data++;
 	    if (c == '\"') {
 		com_token[len] = 0;
 		return data;