Adding coverage to requirements.
Fixing exception locations.