Merge pull request #836 from stevenolen/master

catch additional exception, closes #831