Improved item validity checking

Gobble gobble.