Merge pull request #1417 from PhilipRosedale/master

Cleanup and tweaks to make throw/catch better