Make #exception more robust
Merge pull request #15 from rking/master

Make monkeypatched #exception cause fewer exceptions