cppcheck warned because the later check involved an
index that’s used in the earlier check.  That could
easily be backwards if the index is not in range
without the check happening first.

Change-Id: Iaa79b07bb1eccd51db5e27252ab83d39f8e8b2f2