Fix overly accurate throwing
Merge pull request #863 from sfalexrog/fixes

Fix overly accurate throwing