Merge pull request #836 from stevenolen/master

catch additional exception, closes #831
Merge pull request #838 from ohmage/ohmage-2.16

Merge pull request #836 from stevenolen/master