Simplified exception interface to no longer require environ
Fix typo
merge from upstream