Merge pull request #1036 from hurtonm/master

CURVE: Implement client-side ERROR handling
CURVE: Implement server-side ERROR handling