Index: uspace/app/hrctl/hrctl.c
===================================================================
--- uspace/app/hrctl/hrctl.c	(revision 964e8973d5219480170994287cdc9b715cd252a5)
+++ uspace/app/hrctl/hrctl.c	(revision fde80323976158fdabc67da2a0a46bab9e6c97df)
@@ -108,5 +108,5 @@
 	size_t i;
 
-	for (i = 0; i < HR_MAX_EXTENTS; i++) {
+	for (i = 0; i < HR_MAX_EXTENTS && optind < argc; i++) {
 		rc = loc_service_get_id(argv[optind], &cfg->devs[i], 0);
 		if (rc == ENOENT) {
@@ -119,7 +119,5 @@
 			return EINVAL;
 		}
-
-		if (++optind >= argc)
-			break;
+		optind++;
 	}