Do not swallow unhandled exception on Python 2.
Merge pull request #796 from schlamar/patch-2

Do not swallow unhandled exception on Python 2.