NCI-Agency/anet#530: Add changes requested from peer-review
NCI-Agency/anet#530: Add changes requested from peer-review

- Replaced Exception with more specific alternative
- Fixed typo

NCI-Agency/anet,NCI-Agency/anet,NCI-Agency/anet,NCI-Agency/anet,NCI-Agency/anet