Merge pull request #91 from rixner/master

More complete implementation of try/except