Hmm, your pull request doesn't really explain about this exception handling.  Could you please explain why?