Revert "catch additional exception, closes #831"
Merge pull request #834 from ohmage/revert-832-master

Revert "catch additional exception, closes #831"