new exceptions and new edits
Merge pull request #247 from andy2013march/master

new exceptions and 2 edits