Slight optimization with regards to units that are processed.
Reverted change to error message.
Merge pull request #395 from CorruptedHeart/Optimise

Slight optimization with regards to units that are processed.