Merge remote branch 'cloudant:71810-handle-errors-terms-from-fabric'

This closes #146

Signed-off-by: ILYA Khlopotov <iilyak@apache.org>