Moved out of parent class

YAGNI
better name for attachment check
Another name
Refactored to separate attachment check from errors
better name from Graham