catch additional exception, closes #831

merging into 2.16 branch.