--- trunk/grubby/grubby.c	2014/07/16 11:00:50	2717
+++ trunk/grubby/grubby.c	2014/07/16 11:01:36	2718
@@ -1960,11 +1960,13 @@
 	}
 
 	indexVars[i + 1] = -1;
-	
+
 	i = 0;
 	if (index) {
-	    while (i < *index) i++;
-	    if (indexVars[i] == -1) return NULL;
+	    while (i < *index) {
+		i++;
+		if (indexVars[i] == -1) return NULL;
+	    }
 	}
 
 	entry = findEntryByIndex(config, indexVars[i]);