catch additional exception, closes #831
Merge pull request #832 from stevenolen/master

catch additional exception, closes #831
Merge pull request #833 from ohmage/master

merge to 2.16.1