Add exception type and minor update to doc string
Merge pull request #187 from adamrp/issue_185

Add exception type and minor update to doc string