Adding a check to see if units are indexed when they are ought to be