Catch exception, not anything (which could be KeyboardInterrupt).
Merge pull request #328 from lucian1900/master

Catch Exception, not everything