ohmage/server — pull request #836 by stevenolen (2014-09-11 16:43:02+00:00)
Title: catch additional exception, closes #831

merging into 2.16 branch.